On Thu, May 14, 2020 at 6:33 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: > * en/merge-rename-rename-worktree-fix (2020-05-14) 1 commit > - merge-recursive: fix rename/rename(1to2) for working tree with a binary > > When a binary file gets renamed and then merged with a minor > change, the copy on the working tree while conflict resolution > sometimes got "their" version and not "ours". This summary feels misleading; it's not simple rename + content merge, it's double rename + content merge. Perhaps: 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.
