tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Thu, 15 Feb 2007 05:38:00 -0200
changeset 4087 587c6c652f82
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Fix util.shellquote on windows.

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