Mercurial > hg

view tests/test-issue619.out @ 12071:45ff6dcf82ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-lock-badness
author Adrian Buehlmann <adrian@cadifra.com>
date Thu, 26 Aug 2010 12:41:00 +0200
parents 6f1d1ed3e19a
children
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: merging with a working directory ancestor has no effect
done