tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 18 Sep 2006 17:32:28 +0200
changeset 3130 2e043c9a38a6
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
hgweb: fix errors spotted by pychecker

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