summaryrefslogtreecommitdiffstats
path: root/test/conflicts.test
Commit message (Expand)AuthorAgeFilesLines
* - 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