aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/xdiff/xinclude.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/xdiff/xinclude.h')
-rw-r--r--src/nvim/xdiff/xinclude.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/nvim/xdiff/xinclude.h b/src/nvim/xdiff/xinclude.h
index 5a359d1431..a412404bfe 100644
--- a/src/nvim/xdiff/xinclude.h
+++ b/src/nvim/xdiff/xinclude.h
@@ -40,6 +40,7 @@
#if !defined(XINCLUDE_H)
#define XINCLUDE_H
+// This effectively re-verts b46054b3746271d23feab0 from git
#include <ctype.h>
#include <stdio.h>
#include <stdlib.h>
@@ -48,7 +49,10 @@
#endif
#include <string.h>
#include <limits.h>
-
+// This include comes from git, so uncomment it
+#if 0
+#include "git-compat-util.h"
+#endif
#include "xmacros.h"
#include "xdiff.h"
#include "xtypes.h"
@@ -58,4 +62,4 @@
#include "xemit.h"
-#endif // #if !defined(XINCLUDE_H)
+#endif /* #if !defined(XINCLUDE_H) */