Mercurial > hg

view tests/test-issue619.out @ 6058:88b4d726332a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not abort rollback if undo.branch isn't available, but warn.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 09 Feb 2008 19:39: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