merge-recursive: improve handling for rename/rename(2to1) conflicts
authorElijah Newren <newren@gmail.com>
Thu, 8 Nov 2018 04:40:27 +0000 (20:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 8 Nov 2018 05:23:53 +0000 (14:23 +0900)
commitbbafc9c...4ae7109f636772350934b3c5d747da44
tree6a0fa50...43947df42adab3818ce62f90d136ac0acopy hash to clipboard (tree)
parent7f86716...6f31f5d1cc9d9748b7dc62b76a428cc5copy hash to clipboard (diff)
merge-recursive.c
t/t6036-recursive-corner-cases.sh
t/t6042-merge-rename-corner-cases.sh
t/t6043-merge-rename-directories.sh