Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Git 2.17-rc2
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 2f232ad3b40e6a94ea78bd856a4ea2deaaf1d468..869092f7b9bc0ce1104a1c43c7201acdee2eb4f8 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-2090,7
+2090,7
@@
int merge_recursive(struct merge_options *o,
{
struct commit_list *iter;
struct commit *merged_common_ancestors;
- struct tree *mrtree
= mrtree
;
+ struct tree *mrtree;
int clean;
if (show(o, 4)) {