merge-recur: do not die unnecessarily
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>
Wed, 9 Aug 2006 20:31:49 +0000 (22:31 +0200)
committerJunio C Hamano <junkio@cox.net>
Wed, 9 Aug 2006 21:57:27 +0000 (14:57 -0700)
commit984b657...7e25c426a32feb9b9d46f077b605cb31
tree0d2c7af...34844fd1ff9016909978ed4e6e641ad7copy hash to clipboard (tree)
parent8918b0c...c2667c5a69461955135c709b09561f72copy hash to clipboard (diff)
merge-recursive.c