tests/test-merge5.out
author Brendan Cully <brendan@kublai.com>
Tue, 19 Dec 2006 17:14:45 -0800
changeset 3936 8eccfce0ab5e
parent 3592 fffc8a733bf9
permissions -rw-r--r--
hgweb: simple tests

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