import_orig: Properly abort merge on rollbacks

If merging fails we need to call "git merge --abort"

1 files changed, 6 insertions, 0 deletions

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 60656652..08e29d2c 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -453,6 +453,12 @@ class GitRepository(object):
         args.add(commit)
         self._git_command("merge", args.args)
 
+    def abort_merge(self):
+        """
+        Abort a merge
+        """
+        self._git_command("merge", ["--abort"])
+
     def is_fast_forward(self, from_branch, to_branch):
         """
         Check if an update I{from from_branch} to I{to_branch} would be a fast