Patchwork [15,of,19,pager] resolve: enable pager

login
register
mail settings
Submitter Augie Fackler
Date Feb. 19, 2017, 11:13 p.m.
Message ID <bd38eff9de15d07ea9be.1487545986@imladris.local>
Download mbox | patch
Permalink /patch/18669/
State Accepted
Headers show

Comments

Augie Fackler - Feb. 19, 2017, 11:13 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1486440370 18000
#      Mon Feb 06 23:06:10 2017 -0500
# Node ID bd38eff9de15d07ea9be63da3d79edd2d41f667d
# Parent  500ccd82255b5769cd8199c379333139f172420d
resolve: enable pager

Patch

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)