tests/test-issue619.out
author Giorgos Keramidas <keramida@ceid.upatras.gr>
Sun, 07 Oct 2007 21:56:36 +0300
changeset 5416 ca890c0c3f1f
parent 4748 8808ea7da86b
child 6375 cdc458b12f0f
permissions -rw-r--r--
osutil.c: style fix - delete trailing end-of-line spaces

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