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

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

hgweb: return content iterator instead of using write() callable
hgweb: return content iterator instead of using write() callable
Thomas Arendsen Hein - - Load All Authors

File last commit:

r6381:0b89315d default
r6785:4879468f default
Show More
test-merge5.out
7 lines | 266 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' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')