Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
submodule: add repo_read_gitmodules
[gitweb.git]
/
ll-merge.c
diff --git
a/ll-merge.c
b/ll-merge.c
index d7eafb61a6831020149d0da607bb47b995192296..b9576efe97b98d8b7971045b7be3698b9592c5e6 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"