[PATCH STABLE] help: describe about choice of :prompt as a fallback merge tool explicitly

[Augie Fackler]

On Sat, May 06, 2017 at 02:36:21AM +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1494005580 -32400
> #      Sat May 06 02:33:00 2017 +0900
> # Branch stable
> # Node ID 35b4871944b3162c82c90444822fdd60b6619a05
> # Parent  40785ccab41006f61039714d0d9b2ed09e401b2a
> help: describe about choice of :prompt as a fallback merge tool explicitly

queued, thanks