$ hg merge --help
hg merge [-P] [-f] [[-r] REV]
merge working directory with another revision
The current working directory is updated with all changes made in the
requested revision since the last common predecessor revision.
Files that changed between either parent are marked as changed for the
next commit and a commit must be performed before any further updates to
the repository are allowed. The next commit will have two parents.
"--tool" can be used to specify the merge tool used for file merges. It
overrides the HGMERGE environment variable and your configuration files.
See "hg help merge-tools" for options.
If no revision is specified, the working directory‘s parent is a head
revision, and the current branch contains exactly one other head, the
other head is merged with by default. Otherwise, an explicit revision with
which to merge with must be provided.
"hg resolve" must be used to resolve unresolved files.
To undo an uncommitted merge, use "hg update --clean ." which will check
out a clean copy of the original merge parent, losing all changes.
Returns 0 on success, 1 if there are unresolved files.
options:
-f --force force a merge with outstanding changes
-r --rev REV revision to merge
-P --preview review revisions to merge (no merge is performed)
-t --tool VALUE specify merge tool
use "hg -v help merge" to show more info
$ hg update --clean 8 files updated, 0 files merged, 1 files removed, 0 files unresolved
再次执行merge。
$ hg merge 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don‘t forget to commit)
原文地址：http://blog.csdn.net/lincyang/article/details/41984627
