[PATCH] resolve: updated help documentation for improved clarity

[Martin Geisler]

Mark Edgington <edgimar at gmail.com> writes:

> The present resolve help text is a bit cumbersome, and users can
> easily overlook / miss that the command can be used for re-merging
> files (using whatever automated merge-tool is set up in one's hg
> config).  This patch is an attempt to improve the readability/clarity
> of the help text.  Feel free to modify it as needed...

Nice -- I like how this mentions that you use 'hg resolve' for
re-merging files. I adjusted the formatting a bit (you should try to
preserve existing ReST markup) and pushed it to stable as 53fdc0989047.

> # HG changeset patch
> # User Mark Edgington <edgimar at gmail.com>
> # Date 1281646102 -7200
> # Node ID d7366882563afded86866f267918307a7cda9817
> # Parent  fda0e478fb7945b15110738885b8f54bcf2ff576
> resolve: updated help documentation for improved clarity


-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://aragost.com/mercurial/