Skip to content

Commit

Permalink
git.el: Pass an explicit argument to enable smerge-mode.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexandre Julliard authored and Junio C Hamano committed Jul 25, 2007
1 parent 1c911dc commit ceefa44
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/emacs/git.el
Original file line number Diff line number Diff line change
Expand Up @@ -1058,7 +1058,7 @@ Return the list of files that haven't been handled."
(let ((info (ewoc-data (ewoc-locate git-status))))
(find-file (git-fileinfo->name info))
(when (eq 'unmerged (git-fileinfo->state info))
(smerge-mode))))
(smerge-mode 1))))

(defun git-find-file-other-window ()
"Visit the current file in its own buffer in another window."
Expand Down

0 comments on commit ceefa44

Please sign in to comment.