Age | Commit message (Expand) | Author | Files | Lines |
2010-05-31 | tests: use "test_cmp", not "diff", when verifying the result | Gary V. Vaughan | 1 | -2/+2 |
2007-04-25 | Add a test for merging changed and rename-changed branches | Alex Riesen | 1 | -0/+23 |
2006-10-27 | t6022: ignoring untracked files by merge-recursive when they do not matter | Junio C Hamano | 1 | -23/+142 |
2006-10-27 | tests: merge-recursive is usable without Python | Junio C Hamano | 1 | -6/+0 |
2006-05-17 | read-tree -m -u: do not overwrite or remove untracked working tree files. | Junio C Hamano | 1 | -0/+1 |
2006-02-18 | Optionally work without python | Johannes Schindelin | 1 | -0/+6 |
2005-12-21 | merge-recursive: conflicting rename case. | Junio C Hamano | 1 | -0/+37 |
2005-12-11 | t/t6022: a new test for renaming merge. | Junio C Hamano | 1 | -0/+164 |