equal
deleted
inserted
replaced
41 |
41 |
42 $ hg resolve -l |
42 $ hg resolve -l |
43 U file1 |
43 U file1 |
44 U file2 |
44 U file2 |
45 |
45 |
46 resolving an unknown path should emit a warning |
46 resolving an unknown path should emit a warning, but not for -l |
47 |
47 |
48 $ hg resolve -m does-not-exist |
48 $ hg resolve -m does-not-exist |
49 arguments do not match paths that need resolving |
49 arguments do not match paths that need resolving |
|
50 $ hg resolve -l does-not-exist |
50 |
51 |
51 resolve the failure |
52 resolve the failure |
52 |
53 |
53 $ echo resolved > file1 |
54 $ echo resolved > file1 |
54 $ hg resolve -m file1 |
55 $ hg resolve -m file1 |