##// END OF EJS Templates
churn: issue833 was reintroduced in 9bc46d069a76, correct it and add a test
churn: issue833 was reintroduced in 9bc46d069a76, correct it and add a test

File last commit:

r6375:cdc458b1 default
r9388:f7968bba default
Show More
test-issue619.out
10 lines | 314 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: can't merge with ancestor
done