diff options
| author |  Elijah Newren <newren@gmail.com> | 2020-05-13 23:56:32 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-05-14 12:14:19 -0700 |
| commit | 95983da6b461a4394117d4f9fcca211d7fc1403f (patch) | |
| tree | 77bf92abab3f58b782d4e44b5883791c33ca9aad /builtin/mktree.c | |
| parent | The ninth batch (diff) | |
| download | tgif-95983da6b461a4394117d4f9fcca211d7fc1403f.tar.xz | |
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>
Diffstat (limited to 'builtin/mktree.c')
0 files changed, 0 insertions, 0 deletions