fix

gitless-vcs · Jun 15, 2016 · d091b42 · d091b42
1 parent 943b82b
commit d091b42
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/gitless/core.py b/gitless/core.py
@@ -907,16 +907,16 @@ def merge(self, src, op_cb=None):
       except ErrorReturnCode as e:
         raise GlError(stdout(e) + stderr(e))
 
+    self._state_cleanup()
     restore_fn = op_cb.restore_ok if op_cb else None
     self._safe_restore(_stash_msg_merge, restore_fn=restore_fn)
-    self._state_cleanup()
 
   def merge_continue(self, op_cb=None):
     if not self.merge_in_progress:
       raise GlError('No merge in progress, nothing to continue')
+    self._state_cleanup()
     restore_fn = op_cb.restore_ok if op_cb else None
     self._safe_restore(_stash_msg_merge, restore_fn=restore_fn)
-    self._state_cleanup()
 
   @property
   def merge_in_progress(self):