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 $ hg resolve -l --no-status |
|
47 file1 |
|
48 file2 |
|
49 |
46 resolving an unknown path should emit a warning, but not for -l |
50 resolving an unknown path should emit a warning, but not for -l |
47 |
51 |
48 $ hg resolve -m does-not-exist |
52 $ hg resolve -m does-not-exist |
49 arguments do not match paths that need resolving |
53 arguments do not match paths that need resolving |
50 $ hg resolve -l does-not-exist |
54 $ hg resolve -l does-not-exist |
58 |
62 |
59 $ hg resolve -l |
63 $ hg resolve -l |
60 R file1 |
64 R file1 |
61 U file2 |
65 U file2 |
62 |
66 |
|
67 $ hg resolve -l -Tjson |
|
68 [ |
|
69 { |
|
70 "path": "file1", |
|
71 "status": "R" |
|
72 }, |
|
73 { |
|
74 "path": "file2", |
|
75 "status": "U" |
|
76 } |
|
77 ] |
|
78 |
63 resolve -m without paths should mark all resolved |
79 resolve -m without paths should mark all resolved |
64 |
80 |
65 $ hg resolve -m |
81 $ hg resolve -m |
66 (no more unresolved files) |
82 (no more unresolved files) |
67 $ hg commit -m 'resolved' |
83 $ hg commit -m 'resolved' |
68 |
84 |
69 resolve -l should be empty after commit |
85 resolve -l should be empty after commit |
70 |
86 |
71 $ hg resolve -l |
87 $ hg resolve -l |
|
88 |
|
89 $ hg resolve -l -Tjson |
|
90 [ |
|
91 ] |
72 |
92 |
73 resolve --all should abort when no merge in progress |
93 resolve --all should abort when no merge in progress |
74 |
94 |
75 $ hg resolve --all |
95 $ hg resolve --all |
76 abort: resolve command not applicable when not merging |
96 abort: resolve command not applicable when not merging |