| commit | 934d9a24078e65111e9946ad3449c3fa9c06475e | |
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | |
| Wed, 9 Aug 2006 16:43:03 +0000 (9 18:43 +0200) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 9 Aug 2006 21:54:00 +0000 (9 14:54 -0700) | ||
| tree | 2d3c0a364e51a392785bde9508efcede26543828 | treesnapshot (tar.gz zip) |
| parent | c1964a006f9035cbdc6de8e55768fc6ad00d4825 | commitdiff |
merge-recur: if there is no common ancestor, fake empty one
This fixes the coolest merge ever.
[jc: with two "Oops that's not it" fixes from Johannes and Alex,
and an obvious type mismatch fix.]
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This fixes the coolest merge ever.
[jc: with two "Oops that's not it" fixes from Johannes and Alex,
and an obvious type mismatch fix.]
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |