merge-recur: if there is no common ancestor, fake empty one
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 9 Aug 2006 16:43:03 +0000 (18:43 +0200)
committerJunio C Hamano <junkio@cox.net>
Wed, 9 Aug 2006 21:54:00 +0000 (14:54 -0700)
commit934d9a2...078e65111e9946ad3449c3fa9c06475e
tree2d3c0a3...4e51a392785bde9508efcede26543828copy hash to clipboard (tree)
parentc1964a0...6f9035cbdc6de8e55768fc6ad00d4825copy hash to clipboard (diff)
merge-recursive.c