Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
am: improve author-script error reporting
[gitweb.git]
/
builtin
/
merge.c
diff --git
a/builtin/merge.c
b/builtin/merge.c
index 8d85d31a61b8fbb53b04a9f506c0d7aca93e35d9..e331ca6d481005f6122fa6fda6075728f893632d 100644
(file)
--- a/
builtin/merge.c
+++ b/
builtin/merge.c
@@
-36,6
+36,7
@@
#include "packfile.h"
#include "tag.h"
#include "alias.h"
+#include "commit-reach.h"
#define DEFAULT_TWOHEAD (1<<0)
#define DEFAULT_OCTOPUS (1<<1)