tests/test-issue619.out
author Thomas Arendsen Hein <thomas@intevation.de>
Sat, 11 Aug 2007 12:36:04 +0200
changeset 5143 fc6106267198
parent 4815 8808ea7da86b
permissions -rw-r--r--
Hide absolute path from test-no-symlinks output. And add missing eol and remove trailing space which where introduced by the patches adding this test.

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: there is nothing to merge, just use 'hg update' or look at 'hg heads'
done