Mercurial > hg

comparison tests/test-commit-unresolved.t @ 44174:75c2ca094d3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use check_incompatible_arguments() for --abort Differential Revision: https://phab.mercurial-scm.org/D7993
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 24 Jan 2020 15:07:44 -0800
parents 3bc400ccbf99
children 8d72e29ad1e0
comparison
equal deleted inserted replaced
44168:1cb7ae9b0071 44174:75c2ca094d3a
58 58
59 $ hg merge --abort e4501 59 $ hg merge --abort e4501
60 abort: cannot specify a node with --abort 60 abort: cannot specify a node with --abort
61 [255] 61 [255]
62 $ hg merge --abort --rev e4501 62 $ hg merge --abort --rev e4501
63 abort: cannot specify both --rev and --abort 63 abort: cannot specify both --abort and --rev
64 [255] 64 [255]
65 65
66 #if abortcommand 66 #if abortcommand
67 when in dry-run mode 67 when in dry-run mode
68 $ hg abort --dry-run 68 $ hg abort --dry-run
142 $ hg merge -r 4 142 $ hg merge -r 4
143 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 143 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
144 (branch merge, don't forget to commit) 144 (branch merge, don't forget to commit)
145 145
146 $ hg merge --preview --abort 146 $ hg merge --preview --abort
147 abort: cannot specify --preview with --abort 147 abort: cannot specify both --abort and --preview
148 [255] 148 [255]
149 149
150 $ hg abort 150 $ hg abort
151 aborting the merge, updating back to 68352a18a7c4 151 aborting the merge, updating back to 68352a18a7c4
152 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 152 1 files updated, 0 files merged, 1 files removed, 0 files unresolved