Mercurial > hg

view tests/test-issue619.out @ 6101:abb1c451a88e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Define tla username locally in baz and tla tests Suggested by Alexis S. L. Carvalho.
author Patrick Mezard <pmezard@gmail.com>
date Wed, 13 Feb 2008 00:40:18 +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