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) @@ -4867,7 +4869,8 @@ fm.startitem() fm.context(ctx=wctx) fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label) - fm.write('path', '%s\n', f, label=label) + fm.data(path=f) + fm.plain('%s\n' % uipathfn(f), label=label) fm.end() return 0 diff --git a/tests/test-resolve.t b/tests/test-resolve.t --- a/tests/test-resolve.t +++ b/tests/test-resolve.t @@ -67,6 +67,9 @@ $ hg resolve -l R file1 U file2 + $ hg resolve -l --config ui.relative-paths=yes + R ../file1 + U ../file2 $ hg resolve --re-merge filez file2 arguments do not match paths that need resolving (try: hg resolve --re-merge path:filez path:file2)