summaryrefslogtreecommitdiffstats
path: root/test/merge.test
Commit message (Collapse)AuthorAgeFilesLines
* - No longer remove common extensions (.dif, .diff, .patch, .gz,Andreas Gruenbacher2004-01-311-6/+6
| | | | | | | .bz2) from patch names. This allows patches in the same series that only differ by extension, and cleans up the scripts a little. Also don't remove extensions when printing patch names. - Remove unused diffstat code.
* Add test case for patch merging with `quilt diff'.Andreas Gruenbacher2003-10-271-0/+87