##// END OF EJS Templates
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j
adjust test-fetch output to non-default HGPORT, e.g. with run-tests.py -j

File last commit:

r4748:8808ea7d default
r6246:35bf9c23 default
Show More
test-issue619.out
10 lines | 358 B | text/plain | TextLexer
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