summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
AgeCommit message (Expand)Author
2007-04-26Add a test for merging changed and rename-changed branchesAlex Riesen
2006-10-28t6022: ignoring untracked files by merge-recursive when they do not matterJunio C Hamano
2006-10-27tests: merge-recursive is usable without PythonJunio C Hamano
2006-05-17read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano
2006-02-19Optionally work without pythonJohannes Schindelin
2005-12-22merge-recursive: conflicting rename case.Junio C Hamano
2005-12-11t/t6022: a new test for renaming merge.Junio C Hamano