summaryrefslogtreecommitdiffstats
path: root/test/conflicts.test
Commit message (Expand)AuthorAgeFilesLines
* Add a new test case for conflicts while pushing.Andreas Gruenbacher2003-10-271-0/+139