diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-04 13:33:32 -0800 |
| commit | ac193e0e0aa5e93263b82777219167c83c316b7e (patch) | |
| tree | c10d2d6c8eaeb8f5f62885f3ba7747802c7bcd14 /t/t4013/diff.diff_--no-index_--raw_--abbrev=4_dir2_dir | |
| parent | Merge branch 'nd/i18n' (diff) | |
| parent | t6036: avoid non-portable "cp -a" (diff) | |
| download | tgif-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/t4013/diff.diff_--no-index_--raw_--abbrev=4_dir2_dir')
0 files changed, 0 insertions, 0 deletions