Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 40115:5cde774f7244

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: document about "resolve" template keywords
author Yuya Nishihara <yuya@tcha.org>
date Sun, 07 Oct 2018 23:05:00 +0900
parents 910eefeead82
children b049499fb0ba
comparison
equal deleted inserted replaced
40114:910eefeead82 40115:5cde774f7244
4676 4676
4677 Mercurial will not let you commit files with unresolved merge 4677 Mercurial will not let you commit files with unresolved merge
4678 conflicts. You must use :hg:`resolve -m ...` before you can 4678 conflicts. You must use :hg:`resolve -m ...` before you can
4679 commit after a conflicting merge. 4679 commit after a conflicting merge.
4680 4680
4681 .. container:: verbose
4682
4683 Template:
4684
4685 The following keywords are supported in addition to the common template
4686 keywords and functions. See also :hg:`help templates`.
4687
4688 :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``.
4689 :path: String. Repository-absolute path of the file.
4690
4681 Returns 0 on success, 1 if any files fail a resolve attempt. 4691 Returns 0 on success, 1 if any files fail a resolve attempt.
4682 """ 4692 """
4683 4693
4684 opts = pycompat.byteskwargs(opts) 4694 opts = pycompat.byteskwargs(opts)
4685 confirm = ui.configbool('commands', 'resolve.confirm') 4695 confirm = ui.configbool('commands', 'resolve.confirm')