tests/test-conflict.out
author Johannes Stezenbach <js@sig21.net>
Sat, 07 Jun 2008 09:49:34 +0200
changeset 6652 ffcf8e82f647
parent 6518 92ccccb55ba3
child 7821 9fe7e6acf525
permissions -rw-r--r--
help: enable listing of a subset of the command list Instead of giving the "command %s is ambiguous" error message with a bare list of possible command, display help list for all commands starting with the given string.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges
e7fe8eb3e180+0d24b7662d3e+ tip
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig