Mercurial > hg

view tests/test-update-renames.out @ 11934:cf858e76e992

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifest: correct readdelta() according to parentdeltas
author Pradeepkumar Gayam <in3xes@gmail.com>
date Tue, 10 Aug 2010 22:28:52 +0530
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