tests/test-merge5.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 22 Aug 2006 16:03:55 -0700
changeset 2992 7017fc9a9478
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
MQ: Make more commands return meaningful errors.

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