merge-recursive: Consider modifications in rename/rename(2to1) conflicts
authorElijah Newren <newren@gmail.com>
Fri, 12 Aug 2011 05:20:18 +0000 (23:20 -0600)
committerJunio C Hamano <gitster@pobox.com>
Sun, 14 Aug 2011 21:19:39 +0000 (14:19 -0700)
commit434b852...e7a68893106f6360ff0a261f03c37512
treea618e06...9b7224b8336ed9e9b2d9ae8d16e76659copy hash to clipboard (tree)
parentdac4741...54e7672e69d1bc6b4f912cd16ad83b38copy hash to clipboard (diff)
merge-recursive.c
t/t6036-recursive-corner-cases.sh
t/t6042-merge-rename-corner-cases.sh