tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 16 Oct 2006 12:49:11 +0200
changeset 3410 57f94c609c43
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
fix rss template

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