view tests/test-issue619.out @ 5432:0d154bce2341

osutil: Solaris build fix
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 09 Oct 2007 08:39:37 -0700
parents 8808ea7da86b
children
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