Mercurial > hg

view tests/test-issue619.out @ 6238:aac270593ef7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: rename MAPFILE into REVMAP to disambiguate with filemap
author Patrick Mezard <pmezard@gmail.com>
date Wed, 12 Mar 2008 23:21:01 +0100
parents 8808ea7da86b
children cdc458b12f0f
line wrap: on
line source

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
done