Sorry, I forgot to change this to [PATCH v2] or something.
And...
Stephan Beyer wrote:
quoted hunk ↗ jump to hunk
diff --git a/merge-recursive.h b/merge-recursive.h
index f37630a..a9eead3 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -1,6 +1,8 @@
#ifndef MERGE_RECURSIVE_H
#define MERGE_RECURSIVE_H
+extern struct commit *make_virtual_commit(struct tree *tree,
+ const char *comment);
int merge_recursive(struct commit *h1,
struct commit *h2,
const char *branch1,
Is this a mistake that some forward declarations in header files are not
declared "extern"?
Regards,
Stephan
--
Stephan Beyer [off-list ref], PGP 0x6EDDD207FCC5040F