tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 26 Dec 2006 03:13:57 +0100
changeset 3972 356e20d46b34
parent 3592 fffc8a733bf9
permissions -rw-r--r--
commands.py: use contexts in various places (debug*state, revert)

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