Show More
@@ -4840,6 +4840,8 b' def resolve(ui, repo, *pats, **opts):' | |||
|
4840 | 4840 | b'$$ &Yes $$ &No')): |
|
4841 | 4841 | raise error.Abort(_('user quit')) |
|
4842 | 4842 | |
|
4843 | uipathfn = scmutil.getuipathfn(repo) | |
|
4844 | ||
|
4843 | 4845 | if show: |
|
4844 | 4846 | ui.pager('resolve') |
|
4845 | 4847 | fm = ui.formatter('resolve', opts) |
@@ -4867,7 +4869,8 b' def resolve(ui, repo, *pats, **opts):' | |||
|
4867 | 4869 | fm.startitem() |
|
4868 | 4870 | fm.context(ctx=wctx) |
|
4869 | 4871 | fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label) |
|
4870 | fm.write('path', '%s\n', f, label=label) | |
|
4872 | fm.data(path=f) | |
|
4873 | fm.plain('%s\n' % uipathfn(f), label=label) | |
|
4871 | 4874 | fm.end() |
|
4872 | 4875 | return 0 |
|
4873 | 4876 |
@@ -67,6 +67,9 b' tell users how they could have used reso' | |||
|
67 | 67 | $ hg resolve -l |
|
68 | 68 | R file1 |
|
69 | 69 | U file2 |
|
70 | $ hg resolve -l --config ui.relative-paths=yes | |
|
71 | R ../file1 | |
|
72 | U ../file2 | |
|
70 | 73 | $ hg resolve --re-merge filez file2 |
|
71 | 74 | arguments do not match paths that need resolving |
|
72 | 75 | (try: hg resolve --re-merge path:filez path:file2) |
General Comments 0
You need to be logged in to leave comments.
Login now