diff options
| author | Alexandre Julliard <julliard@winehq.org> | 2007-07-24 12:02:28 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-25 00:06:38 -0700 |
| commit | ceefa44fe2d72f73548c4c36b42916b9c60ae16b (patch) | |
| tree | 9d8c7a481fcbd271a378db23c1cb711126432916 /contrib | |
| parent | 1c911dc86cd8c504fbad98a75b28cbc92317a0e8 (diff) | |
| download | git-ceefa44fe2d72f73548c4c36b42916b9c60ae16b.tar.gz git-ceefa44fe2d72f73548c4c36b42916b9c60ae16b.tar.xz | |
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')
| -rw-r--r-- | contrib/emacs/git.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el index b92bbe872..53dd70326 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." |