summaryrefslogtreecommitdiff
path: root/t/t6042-merge-rename-corner-cases.sh
AgeCommit message (Expand)Author
2019-10-23t604[236]: do not run setup in separate testsElijah Newren
2019-06-05merge-recursive: restore accidentally dropped setting of pathElijah Newren
2019-01-17t6042: work around speed optimization on WindowsJohannes Schindelin
2018-11-08merge-recursive: improve rename/rename(1to2)/add[/add] handlingElijah Newren
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsElijah Newren
2018-11-08merge-recursive: fix rename/add conflict handlingElijah Newren
2018-11-08t6036, t6042: testcases for rename collision of already conflicting filesElijah Newren
2018-11-08t6042: add tests for consistency in file collision conflict handlingElijah Newren
2018-08-17Merge branch 'en/abort-df-conflict-fixes'Junio C Hamano
2018-08-02Merge branch 'en/t6042-insane-merge-rename-testcases'Junio C Hamano
2018-07-31read-cache: fix directory/file conflict handling in read_index_unmerged()Elijah Newren
2018-07-16t6000-t6999: fix broken &&-chainsEric Sunshine
2018-07-03t6042: add testcase covering long chains of rename conflictsElijah Newren
2018-07-03t6042: add testcase covering rename/rename(2to1)/delete/delete conflictElijah Newren
2018-07-03t6042: add testcase covering rename/add/delete conflict typeElijah Newren
2018-05-28t6036, t6042: prefer test_cmp to sequences of testElijah Newren
2018-05-28t6036, t6042: prefer test_path_is_file, test_path_is_missingElijah Newren
2018-05-28t6036, t6042: use test_line_count instead of wc -lElijah Newren
2018-05-28t6036, t6042: use test_create_repo to keep tests independentElijah Newren
2012-07-27i18n: merge-recursive: mark strings for translationJiang Xin
2012-04-11tests: modernise style: more uses of test_line_countStefano Lattarini
2011-08-14merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren
2011-08-14merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren
2011-08-14merge-recursive: Provide more info in conflict markers with file renamesElijah Newren
2011-08-14merge-recursive: Improve handling of rename target vs. directory additionElijah Newren
2011-08-14merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren
2011-08-14t6042: Add failing testcases for rename/rename/add-{source,dest} conflictsElijah Newren
2011-08-14t6042: Ensure rename/rename conflicts leave index and workdir in sane stateElijah Newren
2011-08-14t6042: Add tests for content issues with modify/rename/directory conflictsElijah Newren
2011-08-14t6042: Add a testcase where undetected rename causes silent file deletionElijah Newren
2011-08-14t6042: Add a pair of cases where undetected renames cause issuesElijah Newren
2011-08-14t6042: Add failing testcase for rename/modify/add-source conflictElijah Newren
2011-08-14t6042: Add a testcase where git deletes an untracked fileElijah Newren
generated by cgit v0.10.2-6-g49f6 at 2024-04-16 23:11:38 (GMT)