summaryrefslogtreecommitdiff
path: root/t/t4013/diff.diff_master_master^_side
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-05-20 08:33:27 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-05-20 08:33:27 -0700
commitabbd1d9ebf9033924153c7a0f0abb37e7c8e50fd (patch)
treecaea3081d1e04556c08f69522d15f2b478a12be1 /t/t4013/diff.diff_master_master^_side
parentMerge branch 'cb/no-more-gmtime' (diff)
parentmerge-recursive: fix rename/rename(1to2) for working tree with a binary (diff)
downloadtgif-abbd1d9ebf9033924153c7a0f0abb37e7c8e50fd.tar.xz
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
Diffstat (limited to 't/t4013/diff.diff_master_master^_side')
0 files changed, 0 insertions, 0 deletions