rollback a merge could be more friendly ...
rupert.thurner at gmail.com
Fri Jun 3 07:00:29 CDT 2011
$ hg rollback
repository tip rolled back to revision 884 (undo commit)
working directory now based on revisions 883 and 884
$ hg revert --all
abort: uncommitted merge - use "hg update", see "hg help revert"
$ hg update -r 883
abort: outstanding uncommitted merges
it would be nice if mercurial would propose commands which can be
used, in this case no referece to hg help revert, but hg update -C.
More information about the Mercurial