Bug 812606 - tagging rebase step shouldn't try to fire vim to resolve…

… conflicts. r=bhearsum
mozilla · Nov 19, 2012 · d64dc07 · d64dc07
1 parent 6f3e926
commit d64dc07
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/python/util/hg.py b/lib/python/util/hg.py
@@ -466,7 +466,8 @@ def apply_and_push(localrepo, remote, changer, max_attempts=10,
             # After we successfully rebase or strip away heads the push is
             # is attempted again at the start of the loop
             try:
-                run_cmd(['hg', 'rebase'], cwd=localrepo)
+                run_cmd(['hg', '--config', 'ui.merge=internal:merge',
+                         'rebase'], cwd=localrepo)
             except subprocess.CalledProcessError, e:
                 log.debug("Failed to rebase: %s" % str(e))
                 update(localrepo, branch=branch)