tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 08 Aug 2007 12:27:20 +0200
changeset 5122 c80af96943aa
parent 3592 fffc8a733bf9
permissions -rw-r--r--
refactor options from cmdtable - add extracommitopts for user and date - factor stuff

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