From: Glenn Morris <rgm@gnu.org>
Date: Mon, 25 Aug 2014 16:48:08 +0000 (-0400)
Subject: * vc-git.el: Comments.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~433
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/f330aa150e8647594f31bef80bd49a7383efaf32

* vc-git.el: Comments.
---

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 27a2f8b3d4..e9d55336af 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -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))