diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -4840,6 +4840,8 @@ b'$$ &Yes $$ &No')): raise error.Abort(_('user quit')) + uipathfn = scmutil.getuipathfn(repo) + if show: ui.pager('resolve') fm = ui.formatter('resolve', opts) @@ -4868,6 +4870,7 @@ fm.context(ctx=wctx) fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label) fm.write('path', '%s\n', f, label=label) + fm.plain('%s\n' % uipathfn(f), label=label) fm.end() return 0