tests/test-merge5.out
author Edouard Gomez <ed.gomez@free.fr>
Wed, 20 Dec 2006 23:41:27 +0100
changeset 3945 79cf097774ef
parent 3592 fffc8a733bf9
permissions -rw-r--r--
pass the extra dict in rawcommit

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