view tests/test-issue619.out @ 5686:5d14d71148b8

Switch to using cat with EOF doc instead of trying to quote newlines for echo.
author Lee Cantey <lcantey@gmail.com>
date Fri, 21 Dec 2007 14:26:20 -0800
parents 8808ea7da86b
children cdc458b12f0f
line wrap: on
line source

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