##// END OF EJS Templates
resolve: enable pager
Augie Fackler -
r31043:9219165e default
parent child Browse files
Show More
@@ -4300,6 +4300,7 b' def resolve(ui, repo, *pats, **opts):'
4300 hint=('use --all to re-merge all unresolved files'))
4300 hint=('use --all to re-merge all unresolved files'))
4301
4301
4302 if show:
4302 if show:
4303 ui.pager('resolve')
4303 fm = ui.formatter('resolve', opts)
4304 fm = ui.formatter('resolve', opts)
4304 ms = mergemod.mergestate.read(repo)
4305 ms = mergemod.mergestate.read(repo)
4305 m = scmutil.match(repo[None], pats, opts)
4306 m = scmutil.match(repo[None], pats, opts)
General Comments 0
You need to be logged in to leave comments. Login now