Mercurial > hg
comparison tests/test-resolve.t @ 39400:213c0493cea0
resolve: test that we suggest a valid hg command
Differential Revision: https://phab.mercurial-scm.org/D4447
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Sat, 01 Sep 2018 18:00:38 -0400 |
| parents | 56469d475341 |
| children | f07ab9ddc0c0 |
comparison
equal
deleted
inserted
replaced
| 39399:c54d4607e8aa | 39400:213c0493cea0 |
|---|---|
| 65 (try: hg resolve -m path:file1 path:filez) | 65 (try: hg resolve -m path:file1 path:filez) |
| 66 $ hg resolve -m path:file1 path:filez | 66 $ hg resolve -m path:file1 path:filez |
| 67 $ hg resolve -l | 67 $ hg resolve -l |
| 68 R file1 | 68 R file1 |
| 69 U file2 | 69 U file2 |
| 70 $ hg resolve --re-merge filez file2 | |
| 71 arguments do not match paths that need resolving | |
| 72 (try: hg resolve --re-merge path:filez path:file2) | |
| 70 $ hg resolve -m filez file2 | 73 $ hg resolve -m filez file2 |
| 71 arguments do not match paths that need resolving | 74 arguments do not match paths that need resolving |
| 72 (try: hg resolve -m path:filez path:file2) | 75 (try: hg resolve -m path:filez path:file2) |
| 73 $ hg resolve -m path:filez path:file2 | 76 $ hg resolve -m path:filez path:file2 |
| 74 (no more unresolved files) | 77 (no more unresolved files) |