Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
fetch-pack: eliminate spurious error messages
[gitweb.git]
/
builtin
/
merge-recursive.c
diff --git
a/builtin/merge-recursive.c
b/builtin/merge-recursive.c
index c33091b3ed52bc8539ff82f039ec8c7718f3dcc2..3a64f5d0bdbcc8d7d21edb01f285cc8b41755228 100644
(file)
--- a/
builtin/merge-recursive.c
+++ b/
builtin/merge-recursive.c
@@
-1,4
+1,4
@@
-#include "
cache
.h"
+#include "
builtin
.h"
#include "commit.h"
#include "tag.h"
#include "merge-recursive.h"