Keep rename/rename conflicts of intermediate merges while doing recursive merge
authorAlex Riesen <raa.lkml@gmail.com>
Sat, 31 Mar 2007 11:49:38 +0000 (13:49 +0200)
committerJunio C Hamano <junkio@cox.net>
Sat, 31 Mar 2007 20:39:15 +0000 (13:39 -0700)
commita97e407...a16e0cbdf9c4aed736b5e762e035508b
tree30442b9...bf257bff9c7356629b81f93fb7b6c93ecopy hash to clipboard (tree)
parent4f01748...51b530c297eeb5a0ece9af923d5db937copy hash to clipboard (diff)
merge-recursive.c