Mercurial > hg

comparison tests/test-merge-force.t @ 15937:7ed056f1e97d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default into stable for 2.1 code freeze
author Matt Mackall <mpm@selenic.com>
date Thu, 19 Jan 2012 14:34:32 -0600
parents 6c8573dd1b6b
children 94c394653b2a
comparison
equal deleted inserted replaced
15900:29defa7d20f6 15937:7ed056f1e97d
17 Local deleted a file, remote removed 17 Local deleted a file, remote removed
18 18
19 Should fail, since there are deleted files: 19 Should fail, since there are deleted files:
20 20
21 $ hg merge 21 $ hg merge
22 abort: outstanding uncommitted changes (use 'hg status' to list changes) 22 abort: outstanding uncommitted changes
23 (use 'hg status' to list changes)
23 [255] 24 [255]
24 25
25 Should succeed with --force: 26 Should succeed with --force:
26 27
27 $ hg -v merge --force 28 $ hg -v merge --force