* vc-git.el: Comments.
This commit is contained in:
parent
42ee94e0f4
commit
f330aa150e
1 changed files with 4 additions and 0 deletions
|
@ -798,6 +798,10 @@ This prompts for a branch to merge from."
|
|||
(defun vc-git-find-file-hook ()
|
||||
"Activate `smerge-mode' if there is a conflict."
|
||||
(when (and buffer-file-name
|
||||
;; FIXME
|
||||
;; 1) the net result is to call git twice per file.
|
||||
;; 2) v-g-c-f is documented to take a directory.
|
||||
;; http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html
|
||||
(vc-git-conflicted-files buffer-file-name)
|
||||
(save-excursion
|
||||
(goto-char (point-min))
|
||||
|
|
Loading…
Add table
Reference in a new issue