tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 25 Jun 2007 11:29:17 -0700
changeset 4714 a741293793f6
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Make changeset_printer respect ui diffopts

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