summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
AgeCommit message (Collapse)AuthorFilesLines
2005-12-03New test case: merge with directory/file conflictsLibravatar Fredrik Kuivinen1-0/+25
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>