X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/a622d90bbeccf29319dc2c3142a93ae1010648fe..3659ef88d90c0c76acb34c448fb8f61087ff25b8:/stgit/main.py

diff --git a/stgit/main.py b/stgit/main.py
index 008912b..d96ff2e 100644
--- a/stgit/main.py
+++ b/stgit/main.py
@@ -22,7 +22,7 @@ import sys, os
 from optparse import OptionParser, make_option
 
 from stgit.utils import *
-from stgit import stack, git
+from stgit import stack, git, gitmergeonefile
 from stgit.version import version
 from stgit.config import config
 from stgit.commands.common import *
@@ -183,8 +183,8 @@ def main():
             stgit.commands.common.crt_series = command.crt_series
 
         command.func(parser, options, args)
-    except (IOError, CmdException, stack.StackException, git.GitException), \
-               err:
+    except (IOError, CmdException, stack.StackException, git.GitException,
+            gitmergeonefile.GitMergeException), err:
         print >> sys.stderr, '%s %s: %s' % (prog, cmd, err)
         sys.exit(2)
     except KeyboardInterrupt: