tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Thu, 12 Oct 2006 11:40:26 +0200
changeset 3360 ef8307585b41
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
nodesbetween: fix a bug with duplicate heads

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