Split git.merge into two functions

[stgit] / stgit / stack.py

diff --git a/stgit/stack.py b/stgit/stack.py
index 6db789a..26a2b58 100644 (file)
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -1096,7 +1096,7 @@ class Series(PatchSet):
 
             # merge can fail but the patch needs to be pushed
             try:
-                git.merge(bottom, head, top, recursive = True)
+                git.merge_recursive(bottom, head, top)
             except git.GitException, ex:
                 out.error('The merge failed during "push".',
                           'Use "refresh" after fixing the conflicts or'