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