summaryrefslogtreecommitdiffstats
path: root/test/conflicts.test
Commit message (Expand)AuthorAgeFilesLines
* - Fix the test suite so that directories leftover from a previouslyJean Delvare2005-09-231-0/+1
* - Fix the test suite so that it doesn't fail if any higher-levelAndreas Gruenbacher2005-09-231-1/+1
* - When applying a patch with -q and without -f no (individual)Andreas Gruenbacher2004-10-171-1/+1
* - Switch from echo to printf for all translations: This is moreAndreas Gruenbacher2004-07-091-16/+16
* - No longer remove common extensions (.dif, .diff, .patch, .gz,Andreas Gruenbacher2004-01-311-16/+16
* - No longer verify if patches remove cleanly by reverse applyingAndreas Gruenbacher2003-10-311-1/+1
* Add a new test case for conflicts while pushing.Andreas Gruenbacher2003-10-271-0/+139