merge_recursive: Fix renames across paths below D/F conflicts
authorElijah Newren <newren@gmail.com>
Fri, 9 Jul 2010 13:10:54 +0000 (07:10 -0600)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Jul 2010 23:13:00 +0000 (16:13 -0700)
commit5a2580d...2f9aaa30f0acd10df9dbe7a581dd77d9
treef43bd06...dd324f749f7d909e27eda7762cd52d84copy hash to clipboard (tree)
parent3734893...ff391f01981e8af10b2f615268fd2509copy hash to clipboard (diff)
merge-recursive.c
t/t3509-cherry-pick-merge-df.sh
t/t6020-merge-df.sh