git.el: Pass an explicit argument to enable smerge-mode.
Without argument the mode is toggled, which would do the wrong thing if the file was already open. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Alexandre Julliard committed
Jul 24, 2007 at 12:02 UTC
ceefa44fe2d72f73548c4c36b42916b9c60ae16b
1 file changed
+1
-1
contrib/emacs/git.el
+1
-1
@@ -1058,7 +1058,7 @@ Return the list of files that haven't been handled."
1058
(let ((info (ewoc-data (ewoc-locate git-status))))
1059
(find-file (git-fileinfo->name info))
1060
(when (eq 'unmerged (git-fileinfo->state info))
1061
- (smerge-mode))))
1061
+ (smerge-mode 1))))
1062
1063
(defun git-find-file-other-window ()
1064
"Visit the current file in its own buffer in another window."