tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 03 Jul 2007 03:06:40 -0300
changeset 4778 e21a0e12ff10
parent 3592 fffc8a733bf9
permissions -rw-r--r--
hgweb: use lrwxrwxrwx as the permissions of a symlink

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