tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Wed, 08 Aug 2007 23:07:39 +0200
changeset 5125 80309fa23cdb
parent 3592 fffc8a733bf9
permissions -rw-r--r--
hghave: feature absence can be checked by prefixing with 'no-'

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