projects
/
git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'cb/t4201-robustify' into maint
[git]
/
builtin
/
merge-file.c
diff --git
a/builtin/merge-file.c
b/builtin/merge-file.c
index
47dde7c
..
b08803e
100644
(file)
--- a/
builtin/merge-file.c
+++ b/
builtin/merge-file.c
@@
-1,5
+1,6
@@
#include "builtin.h"
#include "cache.h"
+#include "config.h"
#include "xdiff/xdiff.h"
#include "xdiff-interface.h"
#include "parse-options.h"