From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 20 May 2020 15:33:27 +0000 (-0700)
Subject: Merge branch 'en/merge-rename-rename-worktree-fix'
X-Git-Tag: v2.27.0-rc1~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=abbd1d9ebf9033924153c7a0f0abb37e7c8e50fd;p=thirdparty%2Fgit.git

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
---

abbd1d9ebf9033924153c7a0f0abb37e7c8e50fd