Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
merge-recursive.c: mrtree in merge() is not used before set
[gitweb.git]
/
merge-recursive.c
diff --git
a/merge-recursive.c
b/merge-recursive.c
index 19d5f3b2872ec7039508c9b12a89f3013d58c68d..c2e1cb69e3e25ccb1851273ee4ee3a06e795dd37 100644
(file)
--- a/
merge-recursive.c
+++ b/
merge-recursive.c
@@
-1586,7
+1586,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)) {