tests/test-issue619.out
author Jens Bäckman <jens.backman@gmail.com>
Sun, 22 Nov 2009 19:37:19 +0100
changeset 9907 f1ee8009fe10
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
i18n-sv: translated seven commands These commands has been translated: addremove, archive, backout, config, unbundle, verify, version

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