Mercurial > hg

view tests/test-merge5.out @ 6322:108636b9b981

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgk: don't exit if mercurial commands only print warnings
author Dennis Schoen <ds@1d10t.de>
date Wed, 16 Jan 2008 11:50:24 +0100
parents fffc8a733bf9
children 4b0c9c674707
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes