view tests/test-merge4.out @ 690:f762860f82c6

Minor merge fixups

return a proper errorlevel on abort
let force jump across branches
catch exception on unlink

manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #2' -d '0 0' -u user
+ hg update -m 1
+ rm b
+ echo This is file c22
+ hg commit -t 'commit #3' -d '0 0' -u user