##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: unify test-globalopts
tests: unify test-globalopts
Matt Mackall - - Load All Authors

File last commit:

r11417:6f1d1ed3 default
r12194:9e40ea08 default
Show More
test-issue619.out
10 lines | 344 B | text/plain | TextLexer
/ tests / test-issue619.out
History | Annotation | Raw |Copy content |Copy permalink
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: merging with a working directory ancestor has no effect
done