Allow merging bare trees in merge-recursive.
authorShawn O. Pearce <spearce@spearce.org>
Thu, 28 Dec 2006 07:35:24 +0000 (02:35 -0500)
committerJunio C Hamano <junkio@cox.net>
Fri, 29 Dec 2006 03:06:16 +0000 (19:06 -0800)
commita970e84...8ad23a740e456fb4191ed61becef8989
tree717944e...2c7f690eff7becc181f544d2bb6bfcbdcopy hash to clipboard (tree)
parent7ba3c07...c76cbda00f7ed2ac16a659d8f48631bacopy hash to clipboard (diff)
merge-recursive.c