Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Add tests for git push'es mirror mode
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 4a5c77c3b632a9c0636848b933ef5395b01b7103..6c6f595fbc7da09a41228e09cd2c5ef48b91f3f0 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-1572,7
+1572,7
@@
static int merge(struct commit *h1,
{
struct commit_list *iter;
struct commit *merged_common_ancestors;
- struct tree *mrtree;
+ struct tree *mrtree
= mrtree
;
int clean;
if (show(4)) {