# HG changeset patch # User Augie Fackler <au...@google.com> # Date 1486440370 18000 # Mon Feb 06 23:06:10 2017 -0500 # Node ID bd38eff9de15d07ea9be63da3d79edd2d41f667d # Parent 500ccd82255b5769cd8199c379333139f172420d resolve: enable pager
diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -4298,6 +4298,7 @@ def resolve(ui, repo, *pats, **opts): hint=('use --all to re-merge all unresolved files')) if show: + ui.pager('resolve') fm = ui.formatter('resolve', opts) ms = mergemod.mergestate.read(repo) m = scmutil.match(repo[None], pats, opts) _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel