Commits

Marcus Lindblom Sonestedt  committed 097a4cb

rebaseif: revert e649f975bc06 (actually do a proper merge)

  • Participants
  • Parent commits fc03f37

Comments (0)

Files changed (1)

         import traceback
         traceback.print_exc(e)
         hgext.rebase.rebase(ui, repo, abort=True)
+    finally:
+        ui.setconfig('ui', 'merge', origmerge)
+
 
     ui.status(_('rebaseif: failed to rebase, attempting merge\n'))
 
     import mercurial.commands
     mercurial.commands.merge(ui, repo)
-
-    ui.setconfig('ui', 'merge', origmerge)
-
     return 0