tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 17 Oct 2006 17:04:25 -0300
changeset 3434 bf10cd8bc981
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
use ui.readsections in the notify extension

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