Andrew's git / gitweb.git / blobdiff
?
Merge branch 'id/windows-dep-aslr'
[gitweb.git] / builtin / merge-index.c
diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index c99443b095bd8abbe02d4ea87a452d916681c53f..38ea6ad6ca25d5a969afdbfc5b3510ba44e49a33 100644 (file)
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c
@@ -1,3 +1,4 @@
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "builtin.h"
 #include "run-command.h"