##// END OF EJS Templates
inotify: proper fix for issue1542 (partially reverting 67e59a9886d5)...
r8600:d46cdfce default
Show More
test-merge5.out
7 lines | 266 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' or 'hg update -C' to discard changes)
% should succeed
abort: crosses branches (use 'hg merge' or 'hg update -C')