equal
deleted
inserted
replaced
152 |
152 |
153 $ hg resolve -m |
153 $ hg resolve -m |
154 abort: resolve command not applicable when not merging |
154 abort: resolve command not applicable when not merging |
155 [255] |
155 [255] |
156 |
156 |
|
157 can not update or merge when there are unresolved conflicts |
|
158 |
|
159 $ hg up -qC 0 |
|
160 $ echo quux >> file1 |
|
161 $ hg up 1 |
|
162 merging file1 |
|
163 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') |
|
164 1 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
165 use 'hg resolve' to retry unresolved file merges |
|
166 [1] |
|
167 $ hg up 0 |
|
168 abort: outstanding merge conflicts |
|
169 [255] |
|
170 $ hg merge 2 |
|
171 abort: outstanding merge conflicts |
|
172 [255] |
|
173 $ hg merge --force 2 |
|
174 abort: outstanding merge conflicts |
|
175 [255] |
|
176 |
157 set up conflict-free merge |
177 set up conflict-free merge |
158 |
178 |
159 $ hg up -qC 3 |
179 $ hg up -qC 3 |
160 $ hg merge 1 |
180 $ hg merge 1 |
161 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
181 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |