summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
AgeCommit message (Expand)Author
2005-12-03New test case: merge with directory/file conflictsFredrik Kuivinen