tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Thu, 14 Feb 2008 10:28:27 -0600
changeset 6096 d8477881ee0f
parent 3592 fffc8a733bf9
child 6336 4b0c9c674707
permissions -rw-r--r--
hgweb: add new logos

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