tests/test-merge5.out
author Giorgos Keramidas <keramida@ceid.upatras.gr>
Tue, 15 Aug 2006 20:59:55 +0300
changeset 2904 8ca608c1eb02
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
tests: new test for mq qdiff command `hg qdiff .' is supposed to work but it is currently broken. This test should help us verify when it gets fixed.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes