Mercurial > hg

view tests/test-issue619.out @ 5488:247af577fe29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix typo in convert help text, update test
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 05 Nov 2007 20:15:33 +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