Mercurial > hg-stable

changeset 31063:9219165e1cc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: enable pager
author Augie Fackler <augie@google.com>
date Mon, 06 Feb 2017 23:06:10 -0500
parents 5b85ba3d7d77
children cd9cf641043a
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Feb 06 23:06:01 2017 -0500
+++ b/mercurial/commands.py	Mon Feb 06 23:06:10 2017 -0500
@@ -4300,6 +4300,7 @@
                          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)