summaryrefslogtreecommitdiff
path: root/t/t6042-merge-rename-corner-cases.sh
AgeCommit message (Expand)AuthorFilesLines
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsLibravatar Elijah Newren1-14/+24
2018-11-08merge-recursive: fix rename/add conflict handlingLibravatar Elijah Newren1-2/+2
2018-11-08t6036, t6042: testcases for rename collision of already conflicting filesLibravatar Elijah Newren1-0/+118
2018-11-08t6042: add tests for consistency in file collision conflict handlingLibravatar Elijah Newren1-0/+162
2018-08-17Merge branch 'en/abort-df-conflict-fixes'Libravatar Junio C Hamano1-1/+0
2018-08-02Merge branch 'en/t6042-insane-merge-rename-testcases'Libravatar Junio C Hamano1-0/+245
2018-07-31read-cache: fix directory/file conflict handling in read_index_unmerged()Libravatar Elijah Newren1-2/+0
2018-07-16t6000-t6999: fix broken &&-chainsLibravatar Eric Sunshine1-4/+4
2018-07-03t6042: add testcase covering long chains of rename conflictsLibravatar Elijah Newren1-0/+111
2018-07-03t6042: add testcase covering rename/rename(2to1)/delete/delete conflictLibravatar Elijah Newren1-0/+68
2018-07-03t6042: add testcase covering rename/add/delete conflict typeLibravatar Elijah Newren1-0/+66
2018-05-28t6036, t6042: prefer test_cmp to sequences of testLibravatar Elijah Newren1-35/+59
2018-05-28t6036, t6042: prefer test_path_is_file, test_path_is_missingLibravatar Elijah Newren1-20/+20
2018-05-28t6036, t6042: use test_line_count instead of wc -lLibravatar Elijah Newren1-33/+66
2018-05-28t6036, t6042: use test_create_repo to keep tests independentLibravatar Elijah Newren1-413/+474
2012-07-26i18n: merge-recursive: mark strings for translationLibravatar Jiang Xin1-1/+1
2012-04-11tests: modernise style: more uses of test_line_countLibravatar Stefano Lattarini1-1/+1
2011-08-14merge-recursive: Fix working copy handling for rename/rename/add/addLibravatar Elijah Newren1-1/+10
2011-08-14merge-recursive: add handling for rename/rename/add-dest/add-destLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionLibravatar Elijah Newren1-1/+1
2011-08-14merge-recursive: Fix deletion of untracked file in rename/delete conflictsLibravatar Elijah Newren1-1/+1
2011-08-14t6042: Add failing testcases for rename/rename/add-{source,dest} conflictsLibravatar Elijah Newren1-0/+125
2011-08-14t6042: Ensure rename/rename conflicts leave index and workdir in sane stateLibravatar Elijah Newren1-0/+102
2011-08-14t6042: Add tests for content issues with modify/rename/directory conflictsLibravatar Elijah Newren1-0/+141
2011-08-14t6042: Add a testcase where undetected rename causes silent file deletionLibravatar Elijah Newren1-0/+65
2011-08-14t6042: Add a pair of cases where undetected renames cause issuesLibravatar Elijah Newren1-0/+61
2011-08-14t6042: Add failing testcase for rename/modify/add-source conflictLibravatar Elijah Newren1-0/+39
2011-08-14t6042: Add a testcase where git deletes an untracked fileLibravatar Elijah Newren1-0/+36
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 03:40:05 +0000