Age | Commit message (Expand) | Author |
---|---|---|
2007-04-26 | Add a test for merging changed and rename-changed branches | Alex Riesen |
2006-10-28 | t6022: ignoring untracked files by merge-recursive when they do not matter | Junio C Hamano |
2006-10-28 | tests: merge-recursive is usable without Python | Junio C Hamano |
2006-05-17 | read-tree -m -u: do not overwrite or remove untracked working tree files. | Junio C Hamano |
2006-02-19 | Optionally work without python | Johannes Schindelin |
2005-12-22 | merge-recursive: conflicting rename case. | Junio C Hamano |
2005-12-11 | t/t6022: a new test for renaming merge. | Junio C Hamano |