summaryrefslogtreecommitdiff
path: root/contrib/emacs
diff options
context:
space:
mode:
authorAlexandre Julliard <julliard@winehq.org>2007-07-24 10:02:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-25 07:06:38 (GMT)
commitceefa44fe2d72f73548c4c36b42916b9c60ae16b (patch)
tree9d8c7a481fcbd271a378db23c1cb711126432916 /contrib/emacs
parent1c911dc86cd8c504fbad98a75b28cbc92317a0e8 (diff)
downloadgit-ceefa44fe2d72f73548c4c36b42916b9c60ae16b.zip
git-ceefa44fe2d72f73548c4c36b42916b9c60ae16b.tar.gz
git-ceefa44fe2d72f73548c4c36b42916b9c60ae16b.tar.bz2
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>
Diffstat (limited to 'contrib/emacs')
-rw-r--r--contrib/emacs/git.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index b92bbe8..53dd703 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -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."