tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Sat, 21 Jul 2007 16:02:10 -0500
changeset 4960 5c5d23d93447
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Use a weakref for recursive transactions

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