Mercurial > hg-stable

view tests/test-update-renames.out @ 11050:5d35f7d93514

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: refactor diff --stat and qdiff --stat `opts['unified'] = '0'` can be replaced by `diffopts.context = 0`.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 07 Apr 2010 00:45:20 +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