tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Wed, 12 Mar 2008 23:21:01 +0100
changeset 6238 aac270593ef7
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
convert: rename MAPFILE into REVMAP to disambiguate with filemap

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