aboutsummaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
Commit message (Expand)AuthorAge
* tests: use "test_cmp", not "diff", when verifying the resultGary V. Vaughan2010-05-31
* Add a test for merging changed and rename-changed branchesAlex Riesen2007-04-25
* t6022: ignoring untracked files by merge-recursive when they do not matterJunio C Hamano2006-10-27
* tests: merge-recursive is usable without PythonJunio C Hamano2006-10-27
* read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano2006-05-17
* Optionally work without pythonJohannes Schindelin2006-02-18
* merge-recursive: conflicting rename case.Junio C Hamano2005-12-21
* t/t6022: a new test for renaming merge.Junio C Hamano2005-12-11