# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1538921100 -32400
# Node ID 5cde774f724470e220264e768997bf1a29ad650d
# Parent  910eefeead82887e281a8fa4877fadf28b1e7834
help: document about "resolve" template keywords

diff -r 910eefeead82 -r 5cde774f7244 mercurial/commands.py
--- a/mercurial/commands.py	Sun Oct 07 23:00:50 2018 +0900
+++ b/mercurial/commands.py	Sun Oct 07 23:05:00 2018 +0900
@@ -4678,6 +4678,16 @@
        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.
     """