tests/test-issue619.out
author Patrick Mezard <pmezard@gmail.com>
Thu, 09 Aug 2007 23:14:50 +0200
changeset 5134 9b5ae133bd5a
parent 4815 8808ea7da86b
permissions -rw-r--r--
test-no-symlinks: rename .bundle into .hg for consistency.

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