Mercurial > hg

view tests/test-issue619.out @ 5646:c722bd73c948

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix typo in sshargs the original typo dated back to early 2005
author Steve Borho <steve@borho.org>
date Thu, 13 Dec 2007 14:25:51 -0600
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