From patchwork Sun Oct  7 14:32:27 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [4,of,7] help: document about "resolve" template keywords
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 35536
Message-Id: <d1b6f5e6f40350df11ec.1538922747@mimosa>
To: mercurial-devel@mercurial-scm.org
Date: Sun, 07 Oct 2018 23:32:27 +0900

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1538921100 -32400
#      Sun Oct 07 23:05:00 2018 +0900
# Node ID d1b6f5e6f40350df11ecd25c70c724ab8082ce96
# Parent  df05cead5b1b6b06939f20790a43b696189a8012
help: document about "resolve" template keywords

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4678,6 +4678,16 @@ def resolve(ui, repo, *pats, **opts):
        conflicts. You must use :hg:`resolve -m ...` before you can
        commit after a conflicting merge.
 
+    .. container:: verbose
+
+      Template:
+
+      The following keywords are supported in addition to the common template
+      keywords and functions. See also :hg:`help templates`.
+
+      :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
+      :path:    String. Repository-absolute path of the file.
+
     Returns 0 on success, 1 if any files fail a resolve attempt.
     """