Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/commands.py
changeset 39395 a80b8832720d
parent 39393 56469d475341
child 39552 4c807ec07888 
--- 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