Mercurial > hg

view tests/test-update-renames.out @ 12080:eb7ddba6046a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
win32: add Emacs scripts to Inno Setup installer
author Pascal Quantin <pascal.quantin@gmail.com>
date Sun, 29 Aug 2010 22:57:24 +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