tree caea3081d1e04556c08f69522d15f2b478a12be1
parent 7b304ab16c7b1e6cdf6294fe16177a42a2894f8c
parent 95983da6b461a4394117d4f9fcca211d7fc1403f
author Junio C Hamano <gitster@pobox.com> 1589988807 -0700
committer Junio C Hamano <gitster@pobox.com> 1589988807 -0700

Merge branch 'en/merge-rename-rename-worktree-fix'

When a binary file gets modified and renamed on both sides of history
to different locations, both files would be written to the working
tree but both would have the contents from "ours".  This has been
corrected so that the path from each side gets their original content.

* en/merge-rename-rename-worktree-fix:
  merge-recursive: fix rename/rename(1to2) for working tree with a binary