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

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

test-share: Solaris sed can't handle never-ending lines
test-share: Solaris sed can't handle never-ending lines
Stuart W Marks - - Load All Authors

File last commit:

r9717:68a1b9d0 default
r10082:66d8ec33 default
Show More
test-merge5.out
7 lines | 289 B | text/plain | TextLexer
/ tests / test-merge5.out
History | Annotation | Raw |Copy content |Copy permalink
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
created new head
% should abort
abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
% should succeed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved