summaryrefslogtreecommitdiff
path: root/t/t6042-merge-rename-corner-cases.sh
Commit message (Expand)AuthorAgeFilesLines
* merge-recursive: restore accidentally dropped setting of pathElijah Newren2019-06-051-0/+116
* t6042: work around speed optimization on WindowsJohannes Schindelin2019-01-171-2/+2
* merge-recursive: improve rename/rename(1to2)/add[/add] handlingElijah Newren2018-11-081-8/+21
* merge-recursive: improve handling for rename/rename(2to1) conflictsElijah Newren2018-11-081-14/+24
* merge-recursive: fix rename/add conflict handlingElijah Newren2018-11-081-2/+2
* t6036, t6042: testcases for rename collision of already conflicting filesElijah Newren2018-11-081-0/+118
* t6042: add tests for consistency in file collision conflict handlingElijah Newren2018-11-081-0/+162
* Merge branch 'en/abort-df-conflict-fixes'Junio C Hamano2018-08-171-1/+0
|\
| * read-cache: fix directory/file conflict handling in read_index_unmerged()Elijah Newren2018-07-311-2/+0
* | Merge branch 'en/t6042-insane-merge-rename-testcases'Junio C Hamano2018-08-021-0/+245
|\ \
| * | t6042: add testcase covering long chains of rename conflictsElijah Newren2018-07-031-0/+111
| * | t6042: add testcase covering rename/rename(2to1)/delete/delete conflictElijah Newren2018-07-031-0/+68
| * | t6042: add testcase covering rename/add/delete conflict typeElijah Newren2018-07-031-0/+66
* | | t6000-t6999: fix broken &&-chainsEric Sunshine2018-07-161-4/+4
|/ /
* | t6036, t6042: prefer test_cmp to sequences of testElijah Newren2018-05-281-35/+59
* | t6036, t6042: prefer test_path_is_file, test_path_is_missingElijah Newren2018-05-281-20/+20
* | t6036, t6042: use test_line_count instead of wc -lElijah Newren2018-05-281-33/+66
* | t6036, t6042: use test_create_repo to keep tests independentElijah Newren2018-05-281-413/+474
|/
* i18n: merge-recursive: mark strings for translationJiang Xin2012-07-261-1/+1
* tests: modernise style: more uses of test_line_countStefano Lattarini2012-04-111-1/+1
* merge-recursive: Fix working copy handling for rename/rename/add/addElijah Newren2011-08-141-1/+10
* merge-recursive: add handling for rename/rename/add-dest/add-destElijah Newren2011-08-141-1/+1
* merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren2011-08-141-1/+1
* merge-recursive: Provide more info in conflict markers with file renamesElijah Newren2011-08-141-1/+1
* merge-recursive: Improve handling of rename target vs. directory additionElijah Newren2011-08-141-1/+1
* merge-recursive: Fix deletion of untracked file in rename/delete conflictsElijah Newren2011-08-141-1/+1
* t6042: Add failing testcases for rename/rename/add-{source,dest} conflictsElijah Newren2011-08-141-0/+125
* t6042: Ensure rename/rename conflicts leave index and workdir in sane stateElijah Newren2011-08-141-0/+102
* t6042: Add tests for content issues with modify/rename/directory conflictsElijah Newren2011-08-141-0/+141
* t6042: Add a testcase where undetected rename causes silent file deletionElijah Newren2011-08-141-0/+65
* t6042: Add a pair of cases where undetected renames cause issuesElijah Newren2011-08-141-0/+61
* t6042: Add failing testcase for rename/modify/add-source conflictElijah Newren2011-08-141-0/+39
* t6042: Add a testcase where git deletes an untracked fileElijah Newren2011-08-141-0/+36
View Lorry Controller Status