merge-recursive: conflicting rename case.
authorJunio C Hamano <junkio@cox.net>
Mon, 12 Dec 2005 00:44:05 +0000 (16:44 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Dec 2005 06:34:59 +0000 (22:34 -0800)
commit724b511...4fb363ebee828ba3992c831ba006444c
treeafb7301...018273aad233d18240e4e79e9ffbc5e4copy hash to clipboard (tree)
parentc894168...31e4b7da66ed3993a4c92380d38599a8copy hash to clipboard (diff)
git-merge-recursive.py
t/t6022-merge-rename.sh