Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-p4: don't groom exclude path list on every commit
[gitweb.git]
/
builtin
/
merge-ours.c
diff --git
a/builtin/merge-ours.c
b/builtin/merge-ours.c
index 0b07263415785e11c7fc5b1a6da40a25e969b73c..4594507420533262a7b6611386a340cfdb96b25f 100644
(file)
--- a/
builtin/merge-ours.c
+++ b/
builtin/merge-ours.c
@@
-7,6
+7,7
@@
*
* Pretend we resolved the heads, but declare our tree trumps everybody else.
*/
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "git-compat-util.h"
#include "builtin.h"
#include "diff.h"