Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
config: don't implicitly use gitdir or commondir
[gitweb.git]
/
ll-merge.c
diff --git
a/ll-merge.c
b/ll-merge.c
index ac0d4a5d78d956f09aa0082b286babc36f04b593..24ff94e1dd333beab0f2c00748d2fcc63472dfe6 100644
(file)
--- a/
ll-merge.c
+++ b/
ll-merge.c
@@
-5,6
+5,7
@@
*/
#include "cache.h"
+#include "config.h"
#include "attr.h"
#include "xdiff-interface.h"
#include "run-command.h"