Mercurial > hg

view tests/test-issue619.out @ 9183:d0225fa2f6c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
do not translate commit messages It is not very helpful to have 'Added tag %s for changeset %s' and similar messages translated into different languages when people work together using different locales. We now use English strings without support for translations. If needed, the user can still supply a custom string for most commands.
author Martin Geisler <mg@lazybytes.net>
date Wed, 22 Jul 2009 22:50:34 +0200
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