[PATCH 2 of 3] filemerge: create detail of internal merge tools from documentation string

Matt Mackall mpm at selenic.com
Thu Feb 16 22:02:01 UTC 2012


On Sun, 2012-02-12 at 21:39 +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1329050292 -32400
> # Node ID b2fad545c25b5f096a23db9aa6e29251d026726c
> # Parent  f20903d37564f08fd3be3ce48c944355b0ef5e7d
> filemerge: create detail of internal merge tools from documentation string

I've queued these first two, with a followup patch that removes the
obvious redundancy here:

>  @internaltool('internal:prompt', False)
>  def _iprompt(repo, mynode, orig, fcd, fco, fca, toolconf):
> +    """``internal:prompt``

-- 
Mathematics is the supreme nostalgia of our time.





More information about the Mercurial-devel mailing list