Mercurial > hg

view tests/test-issue619.out @ 11825:3742046d3729 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n-it: avoid using two spaces after a '.' See http://en.wikipedia.org/wiki/Sentence_spacing to verify that single spacing is indeed correct.
author Paolo Giarrusso <p.giarrusso@gmail.com>
date Thu, 12 Aug 2010 16:30:17 +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