tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 11 Jul 2007 17:40:41 -0300
changeset 4861 74f36b1027f4
parent 3592 fffc8a733bf9
permissions -rw-r--r--
archive: use util.opener when archiving files. This simplifies the code a bit and makes it easier to support symlinks.

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