tests/test-merge5.out
author Patrick Mezard <pmezard@gmail.com>
Fri, 04 Jan 2008 23:43:55 +0100
changeset 5805 e422305e0853
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
test-convert: test before() and after() conversion actions

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