tests/test-issue619.out
author Steve Borho <steve@borho.org>
Wed, 06 Feb 2008 20:32:06 -0600
changeset 6075 63e0e57ab157
parent 4748 8808ea7da86b
child 6375 cdc458b12f0f
permissions -rw-r--r--
filemerge: add 'checkchanged' merge tool property

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