tests/test-issue619.out
author Jesse Glick <jesse.glick@sun.com>
Tue, 08 Jan 2008 22:40:51 -0500
changeset 5943 ffaf2419de44
parent 4748 8808ea7da86b
child 6375 cdc458b12f0f
permissions -rw-r--r--
Ensure that absolutized paths from hgrc do not contain ../ segments.

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