Mercurial > hg

view tests/test-update-renames.out @ 12179:1447d3a9ff4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
check-code: fix ternary expression introduced in 1ef9b0b5efec
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Wed, 08 Sep 2010 15:16:03 +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