tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Mon, 16 Apr 2007 13:00:23 -0300
changeset 4350 3380eb6d7c32
parent 3592 fffc8a733bf9
permissions -rw-r--r--
fix 'hg <not-log> -v --template foo' with revisions without copies

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