Mercurial > hg

view tests/test-update-renames.out @ 11818:b1ae33b813cb stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg.clone: do not ignore branch argument when source is a repo object This is a revert of 4a70178f9bde. The "bug" mentioned in this changeset is unclear: hopefully using a test to cover this usage should prevent any bugs.
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Fri, 02 Jul 2010 15:12:50 +0900
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