tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 22 Oct 2006 21:47:37 -0300
changeset 3483 8f02223662c8
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
hgweb: make #motd# available for all templates

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