view tests/test-issue619.out @ 9521:e3ce0c30798b

Fix issue 1782 don't do url2pathname conversion for urls And only replace os-dependent path separators when necessary
author Grauw <laurens.hg@grauw.nl>
date Fri, 07 Aug 2009 01:15:16 +0200
parents cdc458b12f0f
children 5b48d819d5f9
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: can't merge with ancestor
done