tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Mon, 25 Jun 2007 21:18:19 -0500
changeset 4724 a084ed4b0c35
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Added tag 0.9.4 for changeset fb4b6d5fe100

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