Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: Add a svn-remote.<name>.pushurl config key
[gitweb.git]
/
builtin
/
merge-tree.c
diff --git
a/builtin/merge-tree.c
b/builtin/merge-tree.c
index 9b25ddc9794efe489ee9ec9fd3203ffa997f03f7..19917426fba19cf60b838ff9b07d20b5e44259a5 100644
(file)
--- a/
builtin/merge-tree.c
+++ b/
builtin/merge-tree.c
@@
-1,4
+1,4
@@
-#include "
cache
.h"
+#include "
builtin
.h"
#include "tree-walk.h"
#include "xdiff-interface.h"
#include "blob.h"