tests/test-issue619.out
author Bryan O'Sullivan <bos@serpentine.com>
Tue, 02 Oct 2007 13:46:59 -0700
changeset 5353 c6adf2be6069
parent 4815 8808ea7da86b
permissions -rw-r--r--
util: add default argument to strdate

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