Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
am: handle --no-patch-format option
[gitweb.git]
/
merge-recursive.h
diff --git
a/merge-recursive.h
b/merge-recursive.h
index e39ee5d78be6bb460bef18aac61deb1ca9b55da0..e6a0828ecacd81d820feb8caa07c90707e97f8b4 100644
(file)
--- a/
merge-recursive.h
+++ b/
merge-recursive.h
@@
-1,8
+1,10
@@
#ifndef MERGE_RECURSIVE_H
#define MERGE_RECURSIVE_H
-#include "unpack-trees.h"
#include "string-list.h"
+#include "unpack-trees.h"
+
+struct commit;
struct merge_options {
const char *ancestor;