Mercurial > hg

view tests/test-issue619.out @ 6122:800e2756c9ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add line anchors to annotate, changeset, diff, file views for hgweb
author Edward Lee <edward.lee@engineering.uiuc.edu>
date Tue, 04 Sep 2007 22:25:37 -0500
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