Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: ui.config -> ui.configbool, for better validation
authorValentin Gatien-Baron <valentin.gatienbaron@gmail.com>
Sat, 01 Sep 2018 17:37:52 -0400
changeset 39395 a80b8832720d
parent 39394 09f23b4f1be3
child 39396 f57682dca1c1
resolve: ui.config -> ui.configbool, for better validation Differential Revision: https://phab.mercurial-scm.org/D4446
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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:
Mercurial