tests/test-issue619.out
author Kostantinos Koukopoulos <kouk@noc.uoa.gr>
Tue, 15 Jan 2008 13:29:59 +0200
changeset 5860 493632bb171c
parent 4748 8808ea7da86b
child 6375 cdc458b12f0f
permissions -rw-r--r--
convert should use default value when CVS_RSH is not set, that value being 'ssh'.

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