Show More
@@ -4995,7 +4995,7 b' def resolve(ui, repo, *pats, **opts):' | |||||
4995 | ms.commit() |
|
4995 | ms.commit() | |
4996 |
|
4996 | |||
4997 | if not didwork and pats: |
|
4997 | if not didwork and pats: | |
4998 |
ui.warn(_("arguments do not match paths that need resolv |
|
4998 | ui.warn(_("arguments do not match paths that need resolving\n")) | |
4999 |
|
4999 | |||
5000 | finally: |
|
5000 | finally: | |
5001 | wlock.release() |
|
5001 | wlock.release() |
@@ -33,7 +33,7 b' resolve -l should contain an unresolved ' | |||||
33 |
|
33 | |||
34 | resolving an unknown path emits a warning |
|
34 | resolving an unknown path emits a warning | |
35 | $ hg resolve -m does-not-exist |
|
35 | $ hg resolve -m does-not-exist | |
36 |
arguments do not match paths that need resolv |
|
36 | arguments do not match paths that need resolving | |
37 |
|
37 | |||
38 | resolve the failure |
|
38 | resolve the failure | |
39 |
|
39 |
General Comments 0
You need to be logged in to leave comments.
Login now