summaryrefslogtreecommitdiff
path: root/t/t6021-merge-criss-cross.sh
AgeCommit message (Collapse)AuthorFilesLines
2005-12-03New test case: Criss-cross mergeLibravatar Fredrik Kuivinen1-0/+92
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>