tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 21 Jun 2007 00:34:14 -0300
changeset 4658 17f5d2069551
parent 3592 fffc8a733bf9
permissions -rw-r--r--
mq: test that qpush cleans things up when it fails

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