summaryrefslogtreecommitdiff
path: root/t/t9126
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-01-04 13:33:32 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-01-04 13:33:32 -0800
commitac193e0e0aa5e93263b82777219167c83c316b7e (patch)
treec10d2d6c8eaeb8f5f62885f3ba7747802c7bcd14 /t/t9126
parentMerge branch 'nd/i18n' (diff)
parentt6036: avoid non-portable "cp -a" (diff)
downloadtgif-ac193e0e0aa5e93263b82777219167c83c316b7e.tar.xz
Merge branch 'en/merge-path-collision'
Updates for corner cases in merge-recursive. * en/merge-path-collision: t6036: avoid non-portable "cp -a" merge-recursive: combine error handling t6036, t6043: increase code coverage for file collision handling merge-recursive: improve rename/rename(1to2)/add[/add] handling merge-recursive: use handle_file_collision for add/add conflicts merge-recursive: improve handling for rename/rename(2to1) conflicts merge-recursive: fix rename/add conflict handling merge-recursive: new function for better colliding conflict resolutions merge-recursive: increase marker length with depth of recursion t6036, t6042: testcases for rename collision of already conflicting files t6042: add tests for consistency in file collision conflict handling
Diffstat (limited to 't/t9126')
0 files changed, 0 insertions, 0 deletions