Mercurial > hg-stable

changeset 39422:a80b8832720d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: ui.config -> ui.configbool, for better validation Differential Revision: https://phab.mercurial-scm.org/D4446
author Valentin Gatien-Baron <valentin.gatienbaron@gmail.com>
date Sat, 01 Sep 2018 17:37:52 -0400
parents 09f23b4f1be3
children f57682dca1c1
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Wed Aug 22 09:12:22 2018 +0800
+++ b/mercurial/commands.py	Sat Sep 01 17:37:52 2018 -0400
@@ -4563,7 +4563,7 @@
     if actioncount > 1:
         raise error.Abort(_("too many actions specified"))
     elif (actioncount == 0
-          and ui.config('commands', 'resolve.explicit-re-merge')):
+          and ui.configbool('commands', 'resolve.explicit-re-merge')):
         hint = _('use --mark, --unmark, --list or --re-merge')
         raise error.Abort(_('no action specified'), hint=hint)
     if pats and all: