summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
AgeCommit message (Expand)AuthorFilesLines
2006-10-27t6022: ignoring untracked files by merge-recursive when they do not matterLibravatar Junio C Hamano1-23/+142
2006-10-27tests: merge-recursive is usable without PythonLibravatar Junio C Hamano1-6/+0
2006-05-17read-tree -m -u: do not overwrite or remove untracked working tree files.Libravatar Junio C Hamano1-0/+1
2006-02-18Optionally work without pythonLibravatar Johannes Schindelin1-0/+6
2005-12-21merge-recursive: conflicting rename case.Libravatar Junio C Hamano1-0/+37
2005-12-11t/t6022: a new test for renaming merge.Libravatar Junio C Hamano1-0/+164