summaryrefslogtreecommitdiffstats
path: root/test/merge.test
Commit message (Expand)AuthorAgeFilesLines
* - No longer remove common extensions (.dif, .diff, .patch, .gz,Andreas Gruenbacher2004-01-311-6/+6
* Add test case for patch merging with `quilt diff'.Andreas Gruenbacher2003-10-271-0/+87