Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
submodule--helper: don't overlay config in remote_submodule_branch
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index 84970cd85e8b0788928ff24b47c8c1b3dc3409e2..900bafdb45d0b28ab5497cfd251535266fc92be5 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-7,6
+7,7
@@
*/
#include "cache.h"
+#include "config.h"
#include "parse-options.h"
#include "builtin.h"
#include "lockfile.h"