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> --- contrib/emacs/git.el | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to contrib/emacs/git.el +1 −1
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index 457f95f..d7f4316 100644 --- a/contrib/emacs/git.el +++ b/contrib/emacs/git.el @@ -1038,7 +1038,7 @@ and returns the process output as a string." (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."
-- 1.5.3.rc2.39.g82303f -- Alexandre Julliard julliard@winehq.org