summaryrefslogtreecommitdiff
path: root/t/t6036-recursive-corner-cases.sh
AgeCommit message (Expand)Author
2019-11-10Fix spelling errors in test commandsElijah Newren
2019-08-19merge-recursive: provide a better label for diff3 common ancestorElijah Newren
2018-12-01t6036: avoid non-portable "cp -a"Carlo Marcelo Arenas Belón
2018-11-08t6036, t6043: increase code coverage for file collision 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-08merge-recursive: increase marker length with depth of recursionElijah Newren
2018-11-08t6036, t6042: testcases for rename collision of already conflicting filesElijah Newren
2018-10-18merge-recursive: avoid showing conflicts with merge branch before HEADElijah Newren
2018-08-02Merge branch 'en/t6036-merge-recursive-tests'Junio C Hamano
2018-08-02Merge branch 'es/test-fixes'Junio C Hamano
2018-07-16t6000-t6999: fix broken &&-chainsEric Sunshine
2018-07-12t6036: fix broken && chain in sub-shellRamsay Jones
2018-07-11t6036: add a failed conflict detection case: regular files, different modesElijah Newren
2018-07-06t6036: add lots of detail for directory/file conflicts in recursive caseElijah Newren
2018-07-03t6036: add a failed conflict detection case with conflicting typesElijah Newren
2018-07-03t6036: add a failed conflict detection case with submodule add/addElijah Newren
2018-07-03t6036: add a failed conflict detection case with submodule modify/modifyElijah Newren
2018-07-03t6036: add a failed conflict detection case with symlink add/addElijah Newren
2018-07-03t6036: add a failed conflict detection case with symlink modify/modifyElijah Newren
2018-07-03t6036: fix broken "merge fails but has appropriate contents" testsEric Sunshine
2018-05-28t6036: prefer test_when_finished to manual cleanup in following testElijah 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
2016-05-17Merge branch 'jc/ll-merge-internal'Junio C Hamano
2016-05-09t6036: remove pointless test that expects failureJunio C Hamano
2016-05-09ll-merge: use a longer conflict marker for internal mergeJunio C Hamano
2015-03-20t: use test_must_fail instead of hand-rolled blocksJeff King
2015-03-20t: fix trivial &&-chain breakageJeff King
2015-03-20t: fix severe &&-chain breakageJeff King
2014-03-31code and test: fix misuses of "nor"Justin Lebar
2011-08-14merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyElijah Newren
2011-08-14merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren
2011-08-14merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren
2011-08-14merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren
2011-08-14merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren
2011-08-14merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren
2011-08-14merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren
2011-08-14t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyElijah Newren
2011-08-14t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyElijah Newren
2011-08-14t6036: tests for criss-cross merges with various directory/file conflictsElijah Newren
2011-08-14t6036: criss-cross with weird content can fool git into clean mergeElijah Newren
2011-08-14t6036: Add differently resolved modify/delete conflict in criss-cross testElijah Newren
2011-08-14t6042: Add a testcase where git deletes an untracked fileElijah Newren
2010-11-30Merge branch 'en/merge-recursive'Junio C Hamano
2010-11-09tests: add missing &&Jonathan Nieder
2010-09-30merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren