Mercurial > hg

view tests/test-update-renames.out @ 12260:0a63e91c519d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-merge-remove
author Adrian Buehlmann <adrian@cadifra.com>
date Sun, 12 Sep 2010 12:11:39 +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