Minor merge fixups return a proper errorlevel on abort let force jump across branches catch exception on unlink manifest hash: 6787814cd75e9f9623c56dc36f865afd54f56bfa

diff -r 3903775176ed b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123
diff -r 3903775176ed b
--- /dev/null
+++ b/b
@@ -0,0 +1,1 @@
+123