tests/test-issue619.out
author Patrick Mezard <pmezard@gmail.com>
Sat, 06 Oct 2007 22:30:24 +0200
changeset 5406 f11554a097c8
parent 4748 8808ea7da86b
child 6375 cdc458b12f0f
permissions -rw-r--r--
test-manifest: test symlink and exec bit display

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