| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | merge-recursive: Fix virtual merge base for rename/rename(1to2)/add-dest | Elijah Newren | 2011-08-14 | 1 | -1/+1 |
| * | t6036: criss-cross + rename/rename(1to2)/add-dest + simple modify | Elijah Newren | 2011-08-14 | 1 | -0/+69 |
| * | merge-recursive: Consider modifications in rename/rename(2to1) conflicts | Elijah Newren | 2011-08-14 | 1 | -28/+10 |
| * | merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base | Elijah Newren | 2011-08-14 | 1 | -1/+1 |
| * | merge-recursive: Fix modify/delete resolution in the recursive case | Elijah Newren | 2011-08-14 | 1 | -2/+2 |
| * | merge-recursive: Make dead code for rename/rename(2to1) conflicts undead | Elijah Newren | 2011-08-14 | 1 | -8/+9 |
| * | merge-recursive: Allow make_room_for_path() to remove D/F entries | Elijah Newren | 2011-08-14 | 1 | -1/+1 |
| * | merge-recursive: Fix recursive case with D/F conflict via add/add conflict | Elijah Newren | 2011-08-14 | 1 | -2/+2 |
| * | t6036: criss-cross + rename/rename(1to2)/add-source + modify/modify | Elijah Newren | 2011-08-14 | 1 | -0/+77 |
| * | t6036: criss-cross w/ rename/rename(1to2)/modify+rename/rename(2to1)/modify | Elijah Newren | 2011-08-14 | 1 | -0/+88 |
| * | t6036: tests for criss-cross merges with various directory/file conflicts | Elijah Newren | 2011-08-14 | 1 | -0/+159 |
| * | t6036: criss-cross with weird content can fool git into clean merge | Elijah Newren | 2011-08-14 | 1 | -0/+83 |
| * | t6036: Add differently resolved modify/delete conflict in criss-cross test | Elijah Newren | 2011-08-14 | 1 | -0/+83 |
| * | t6042: Add a testcase where git deletes an untracked file | Elijah Newren | 2011-08-14 | 1 | -1/+1 |
| * | Merge branch 'en/merge-recursive' | Junio C Hamano | 2010-11-29 | 1 | -3/+182 |
| |\ |
|
| | * | merge-recursive: Avoid doubly merging rename/add conflict contents | Elijah Newren | 2010-09-29 | 1 | -2/+2 |
| | * | t6036: Add testcase for undetected conflict | Elijah Newren | 2010-09-29 | 1 | -0/+85 |
| | * | t6036: Add a second testcase similar to the first but with content changes | Elijah Newren | 2010-09-29 | 1 | -0/+76 |
| | * | t6036: Test index and worktree state, not just that merge fails | Elijah Newren | 2010-09-29 | 1 | -3/+21 |
| * | | tests: add missing && | Jonathan Nieder | 2010-11-09 | 1 | -1/+1 |
| |/ |
|
| * | merge-recursive: don't segfault while handling rename clashes | Junio C Hamano | 2009-07-30 | 1 | -0/+55 |
