tests/test-merge5.out
author Matt Mackall <mpm@selenic.com>
Wed, 15 Aug 2007 15:30:33 -0500
changeset 5176 0edea751bbb2
parent 3592 fffc8a733bf9
permissions -rw-r--r--
test-grep: use lowercase hg command

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