summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
Commit message (Expand)AuthorAgeFilesLines
* 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