Mercurial > hg

view tests/test-update-renames.out @ 11349:cf8a9154a362

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: fix call to ctx.extra() in closed()
author Georg Brandl <georg@python.org>
date Sun, 13 Jun 2010 23:25:27 +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