Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
submodule foreach: fix "<command> --quiet" not being respected
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index bc1aecfe70cfd97d3589d6a0280ca3c68bc31f1c..e47d77baeebe888cfb67f8e03804ffc3ee3715c0 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-6,6
+6,7
@@
* Based on git-merge.sh by Junio C Hamano.
*/
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "cache.h"
#include "config.h"
#include "parse-options.h"