Mercurial > hg

view tests/test-issue619.out @ 7001:9a32b8a6868e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
i18n, imerge: mark command line for translation
author Martin Geisler <mg@daimi.au.dk>
date Sat, 06 Sep 2008 17:44:02 +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