[PATCH] merge: when current branch has 1 or > 2 heads, actually abort

Greg Ward greg-hg at gerg.ca
Tue Jun 15 12:25:25 CDT 2010

On Tue, Jun 15, 2010 at 11:13 AM, Martin Geisler <mg at lazybytes.net> wrote:
> Hehe :-) You probably missed the :hg:`foo` commands in the docstrings,
> they are turned into "hg foo" in the output. This can of course be
> changed in minirst.py, though I like it the way it is now.

Oh yeah... I forgot that (mini)RST emits double quotes.

And they don't require escaping, which makes the patch that started
this discussion slightly less objectionable.  (I think.)

So I now favour double quotes when hg is printing a message to the
user recommending the next command to run.  "I'm not inconsistent, I'm
flexible!"  I'll resend my merge patch accordingly.


More information about the Mercurial-devel mailing list