Mercurial > hg

comparison tests/test-resolve.t @ 42804:7b80ad5af239

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: hint about using `hg resolve` for resolving conflicts This was suggested by one of our users at Google. Makes sense to me. Differential Revision: https://phab.mercurial-scm.org/D6755
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 21 Aug 2019 13:14:39 -0700
parents 4764e8436b2a
children acbfa31cfaf2
comparison
equal deleted inserted replaced
42803:8ab1ae7f1cf4 42804:7b80ad5af239
208 1 files updated, 0 files merged, 0 files removed, 1 files unresolved 208 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
209 use 'hg resolve' to retry unresolved file merges 209 use 'hg resolve' to retry unresolved file merges
210 [1] 210 [1]
211 $ hg up 0 211 $ hg up 0
212 abort: outstanding merge conflicts 212 abort: outstanding merge conflicts
213 (use 'hg resolve' to resolve)
213 [255] 214 [255]
214 $ hg merge 2 215 $ hg merge 2
215 abort: outstanding merge conflicts 216 abort: outstanding merge conflicts
217 (use 'hg resolve' to resolve)
216 [255] 218 [255]
217 $ hg merge --force 2 219 $ hg merge --force 2
218 abort: outstanding merge conflicts 220 abort: outstanding merge conflicts
221 (use 'hg resolve' to resolve)
219 [255] 222 [255]
220 223
221 set up conflict-free merge 224 set up conflict-free merge
222 225
223 $ hg up -qC 3 226 $ hg up -qC 3