summaryrefslogtreecommitdiff
path: root/t/t6022-merge-rename.sh
AgeCommit message (Expand)Author
2005-12-22merge-recursive: conflicting rename case.Junio C Hamano
2005-12-11t/t6022: a new test for renaming merge.Junio C Hamano