aboutsummaryrefslogtreecommitdiff
path: root/t/t6036-recursive-corner-cases.sh
Commit message (Expand)AuthorAge
* code and test: fix misuses of "nor"Justin Lebar2014-03-31
* merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-destElijah Newren2011-08-14
* t6036: criss-cross + rename/rename(1to2)/add-dest + simple modifyElijah Newren2011-08-14
* merge-recursive: Consider modifications in rename/rename(2to1) conflictsElijah Newren2011-08-14
* merge-recursive: Fix rename/rename(1to2) resolution for virtual merge baseElijah Newren2011-08-14
* merge-recursive: Fix modify/delete resolution in the recursive caseElijah Newren2011-08-14
* merge-recursive: Make dead code for rename/rename(2to1) conflicts undeadElijah Newren2011-08-14
* merge-recursive: Allow make_room_for_path() to remove D/F entriesElijah Newren2011-08-14
* merge-recursive: Fix recursive case with D/F conflict via add/add conflictElijah Newren2011-08-14
* t6036: criss-cross + rename/rename(1to2)/add-source + modify/modifyElijah Newren2011-08-14
* t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modifyElijah Newren2011-08-14
* t6036: tests for criss-cross merges with various directory/file conflictsElijah Newren2011-08-14
* t6036: criss-cross with weird content can fool git into clean mergeElijah Newren2011-08-14
* t6036: Add differently resolved modify/delete conflict in criss-cross testElijah Newren2011-08-14
* t6042: Add a testcase where git deletes an untracked fileElijah Newren2011-08-14
* Merge branch 'en/merge-recursive'Junio C Hamano2010-11-29
|\
| * merge-recursive: Avoid doubly merging rename/add conflict contentsElijah Newren2010-09-29
| * t6036: Add testcase for undetected conflictElijah Newren2010-09-29
| * t6036: Add a second testcase similar to the first but with content changesElijah Newren2010-09-29
| * t6036: Test index and worktree state, not just that merge failsElijah Newren2010-09-29
* | tests: add missing &&Jonathan Nieder2010-11-09
|/
* merge-recursive: don't segfault while handling rename clashesJunio C Hamano2009-07-30