do_merge: Pause when the commit fails

diff --git a/do_merge b/do_merge
index 47e02d8b8af1fda51be79430468a210a21884428..f463e6069aba44e6491144f86790e4b8c60a6072 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -136,7 +136,9 @@ for h in $heads; do
                                bash -i || exit
                        }
 #                      [ "$(git status --porcelain)" ] && {
-                               GIT_EDITOR=: execute git commit -v -a
+                               GIT_EDITOR=: execute git commit -v -a || {
+                                       bash -i || exit
+                               }
                                execute git diff -M --stat --summary 'HEAD^..'
 #                      }
                }