Mercurial > hg

view tests/test-merge9.out @ 9128:98d90ad54749

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: hide deprecated commands. A command is considered deprecated if the word "DEPRECATED" is found in the doc string. Such commands are hidden from non-verbose help.
author Dan Villiom Podlaski Christiansen <danchr@gmail.com>
date Fri, 10 Jul 2009 13:40:25 +0200
parents 30cb79d84352
children b2310903c462
line wrap: on
line source

adding bar
adding foo
adding quux1
adding quux2
created new head
merging bar
merging bar failed!
merging foo and baz to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
U bar
R baz
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
merging bar
merging bar failed!
merging baz and foo to baz
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg up --clean' to abandon
% show unresolved
U bar
R baz
% unmark baz
% show
U bar
U baz
M bar
M baz
M quux2
? bar.orig
% re-resolve baz
merging baz and foo to baz
% after
U bar
R baz
% resolve all warning
abort: no files or directories specified; use --all to remerge all files
% resolve all
merging bar
warning: conflicts during merge.
merging bar failed!
% after
U bar
R baz