projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
blame: tolerate bogus e-mail addresses a bit better
[git.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"