tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 10 Oct 2006 18:43:20 -0300
changeset 3339 a7cec14c9b40
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
ui.py: move common code out of config and configbool

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