summaryrefslogtreecommitdiff
path: root/t/t6036-recursive-corner-cases.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/t6036-merge-recursive-tests'Junio C Hamano2018-08-021-0/+451
|\
| * t6036: add a failed conflict detection case: regular files, different modesElijah Newren2018-07-111-0/+67
| * t6036: add a failed conflict detection case with conflicting typesElijah Newren2018-07-031-0/+75
| * t6036: add a failed conflict detection case with submodule add/addElijah Newren2018-07-031-0/+88
| * t6036: add a failed conflict detection case with submodule modify/modifyElijah Newren2018-07-031-0/+88
| * t6036: add a failed conflict detection case with symlink add/addElijah Newren2018-07-031-0/+66
| * t6036: add a failed conflict detection case with symlink modify/modifyElijah Newren2018-07-031-0/+67
* | Merge branch 'es/test-fixes'Junio C Hamano2018-08-021-7/+7
|\ \
| * | t6000-t6999: fix broken &&-chainsEric Sunshine2018-07-161-3/+3
| * | t6036: fix broken "merge fails but has appropriate contents" testsEric Sunshine2018-07-031-4/+4
| |/
* | t6036: fix broken && chain in sub-shellRamsay Jones2018-07-121-1/+1
* | t6036: add lots of detail for directory/file conflicts in recursive caseElijah Newren2018-07-061-55/+201
|/
* t6036: prefer test_when_finished to manual cleanup in following testElijah Newren2018-05-281-10/+12
* t6036, t6042: prefer test_cmp to sequences of testElijah Newren2018-05-281-38/+71
* t6036, t6042: prefer test_path_is_file, test_path_is_missingElijah Newren2018-05-281-2/+2
* t6036, t6042: use test_line_count instead of wc -lElijah Newren2018-05-281-34/+68
* t6036, t6042: use test_create_repo to keep tests independentElijah Newren2018-05-281-402/+452
* Merge branch 'jc/ll-merge-internal'Junio C Hamano2016-05-171-84/+2
|\
| * t6036: remove pointless test that expects failurejc/ll-merge-internalJunio C Hamano2016-05-091-83/+0
| * ll-merge: use a longer conflict marker for internal mergeJunio C Hamano2016-05-091-1/+2
* | t: use test_must_fail instead of hand-rolled blocksJeff King2015-03-201-6/+1
* | t: fix trivial &&-chain breakageJeff King2015-03-201-1/+1
* | t: fix severe &&-chain breakageJeff King2015-03-201-1/+1
|/
* code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-311-1/+1
* merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren2011-08-141-1/+1
* t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyElijah Newren2011-08-141-0/+69
* merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren2011-08-141-28/+10
* merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren2011-08-141-1/+1
* merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren2011-08-141-2/+2
* merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren2011-08-141-8/+9
* merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren2011-08-141-1/+1
* merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren2011-08-141-2/+2
* t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyElijah Newren2011-08-141-0/+77
* t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyElijah Newren2011-08-141-0/+88
* t6036: tests for criss-cross merges with various directory/file conflictsElijah Newren2011-08-141-0/+159
* t6036: criss-cross with weird content can fool git into clean mergeElijah Newren2011-08-141-0/+83
* t6036: Add differently resolved modify/delete conflict in criss-cross testElijah Newren2011-08-141-0/+83
* t6042: Add a testcase where git deletes an untracked fileElijah Newren2011-08-141-1/+1
* Merge branch 'en/merge-recursive'Junio C Hamano2010-11-291-3/+182
|\
| * merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren2010-09-291-2/+2
| * t6036: Add testcase for undetected conflictElijah Newren2010-09-291-0/+85
| * t6036: Add a second testcase similar to the first but with content changesElijah Newren2010-09-291-0/+76
| * t6036: Test index and worktree state, not just that merge failsElijah Newren2010-09-291-3/+21
* | tests: add missing &&Jonathan Nieder2010-11-091-1/+1
|/
* merge-recursive: don't segfault while handling rename clashesJunio C Hamano2009-07-301-0/+55
View Lorry Controller Status