Mercurial > hg-stable

view tests/test-issue619.out @ 7830:55bd03e2e13c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-identify: require no-outer-repo The test expects "There is no Mercurial repository here (.hg not found)"
author Mads Kiilerich <mads@kiilerich.com>
date Thu, 05 Mar 2009 14:53:59 +0100
parents cdc458b12f0f
children 5b48d819d5f9
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: can't merge with ancestor
done