tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 25 Dec 2006 17:43:49 +0100
changeset 3967 dccb83241dd0
parent 3592 fffc8a733bf9
permissions -rw-r--r--
patch: use contexts for diff

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