kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Alexandre Julliard 2007-07-24 12:02:28 +02:00 committed by Junio C Hamano
parent 1c911dc86c
commit ceefa44fe2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/emacs/git.el
View File

@ -1058,7 +1058,7 @@ Return the list of files that haven't been handled."
(let ((info (ewoc-data (ewoc-locate git-status)))) (let ((info (ewoc-data (ewoc-locate git-status))))
(find-file (git-fileinfo->name info)) (find-file (git-fileinfo->name info))
(when (eq 'unmerged (git-fileinfo->state info)) (when (eq 'unmerged (git-fileinfo->state info))
(smerge-mode)))) (smerge-mode 1))))


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