Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
-Wuninitialized: remove some 'init-self' workarounds
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index cc5fa0a94965fad8821cdf81dfe84737f4dee043..7dad1646921d4f5c503646af40446de2edb09d1f 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-2070,7
+2070,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)) {