tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 10 Sep 2006 19:15:08 -0300
changeset 3075 baa3873eb387
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
don't let lazyparser read more data than it can handle This should fix issue368.

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