summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
Commit message (Expand)AuthorAgeFilesLines
* New test case: merge with directory/file conflictsFredrik Kuivinen2005-12-031-0/+25