| commit | 1cf716a21901e0e91db0510d18b212f34cea9e41 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 12 Jan 2007 20:05:58 +0000 (12 12:05 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Fri, 12 Jan 2007 20:05:58 +0000 (12 12:05 -0800) | ||
| tree | c39ab39764dd17607949dac49cb299ee1161a9d5 | treesnapshot (tar.gz zip) |
| parent | 397dfe67c71fdd673bb108b9c6103e4a5e750edb | commitdiff |
merge-recursive: do not report the resulting tree object name
It is not available in the outermost merge, and it is only
useful for debugging merge-recursive in the inner merges.
Sergey Vlasov noticed that the old code accesses an
uninitialized location.
Signed-off-by: Junio C Hamano <junkio@cox.net>
It is not available in the outermost merge, and it is only
useful for debugging merge-recursive in the inner merges.
Sergey Vlasov noticed that the old code accesses an
uninitialized location.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |