Mercurial > hg

view tests/test-issue619.out @ 6283:5a45c82fc7da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert cfebb175704f, fixing the output of 2 tests
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 15 Mar 2008 22:03:18 -0300
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