merge-recursive: fix rename/rename(1to2) for working tree with a binary
authorElijah Newren <newren@gmail.com>
Wed, 13 May 2020 23:56:32 +0000 (23:56 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 May 2020 19:14:19 +0000 (12:14 -0700)
commit95983da6b461a4394117d4f9fcca211d7fc1403f
tree77bf92abab3f58b782d4e44b5883791c33ca9aad
parent172e8ff696ea0ebe002bdd1f61a3544fc7f71a61
merge-recursive: fix rename/rename(1to2) for working tree with a binary

With a rename/rename(1to2) conflict, we attempt to do a three-way merge
of the file contents, so that the correct contents can be placed in the
working tree at both paths.  If the file is a binary, however, no
content merging is possible and we should just use the original version
of the file at each of the paths.

Reported-by: Chunlin Zhang <zhangchunlin@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-recursive.c
t/t6042-merge-rename-corner-cases.sh