make sure we take merge message from right repo

as a side effect, avoid error when other repo doesn't exist anymore...
suhailshergill · Jul 14, 2012 · 69a271a · 69a271a
1 parent 607e131
commit 69a271a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/magit.el b/magit.el
@@ -4550,9 +4550,9 @@ This means that the eventual commit does 'git commit --allow-empty'."
     (setq magit-pre-log-edit-window-configuration
           (current-window-configuration))
     (pop-to-buffer buf)
+    (setq default-directory dir)
     (when (file-exists-p (concat (magit-git-dir) "MERGE_MSG"))
       (insert-file-contents (concat (magit-git-dir) "MERGE_MSG")))
-    (setq default-directory dir)
     (magit-log-edit-mode)
     (make-local-variable 'magit-buffer-internal)
     (setq magit-buffer-internal magit-buf)