Mercurial > hg

view tests/test-update-renames.out @ 12196:e42bc7f66e25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patchbomb: use ui.promptchoice for diffstat to allow localization of choices The extra check for ui.interacive from patchbomb's prompt function is not needed here. Format boolean prompt as in filemerge.py.
author Christian Ebert <blacktrash@gmx.net>
date Wed, 08 Sep 2010 08:31:07 +0200
parents 4f11978ae45d
children
line wrap: on
line source

merging a and b to b
warning: conflicts during merge.
merging b failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges