Mercurial > hg

view tests/test-update-renames.out @ 10894:26cf11f9f322

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: make the templater a local variable After 6722ba3bf80b a class attribute makes no sense.
author Christian Ebert <blacktrash@gmx.net>
date Mon, 12 Apr 2010 17:34:12 +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