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