tests/test-merge5.out
author paul sorenson <sf@metrak.com>
Sat, 23 Jun 2007 22:25:11 -0500
changeset 4692 c135c6cddbec
parent 3592 fffc8a733bf9
permissions -rw-r--r--
Command in doc comment is now on a single line, fixed after previous formatting broke it.

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