tests/test-issue619.out
author Martin Geisler <mg@lazybytes.net>
Sun, 26 Apr 2009 14:49:49 +0200
changeset 8168 8766fee6f225
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
tests: removed redundant "-u test" from test scripts The tests are executed with a .hgrc file which adds "-u test" by default.

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