summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
Commit message (Expand)AuthorAgeFilesLines
* t6022: ignoring untracked files by merge-recursive when they do not matterJunio C Hamano2006-10-271-23/+142
* tests: merge-recursive is usable without PythonJunio C Hamano2006-10-271-6/+0
* read-tree -m -u: do not overwrite or remove untracked working tree files.Junio C Hamano2006-05-171-0/+1
* Optionally work without pythonJohannes Schindelin2006-02-181-0/+6
* merge-recursive: conflicting rename case.Junio C Hamano2005-12-211-0/+37
* t/t6022: a new test for renaming merge.Junio C Hamano2005-12-111-0/+164