##// END OF EJS Templates
merge with i18n stable
r10307:b0298eaa merge default
Show More
test-merge5.out
7 lines | 289 B | text/plain | TextLexer
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