[Emacs-diffs] trunk r117738: * vc-git.el: Comments.

[Glenn Morris]

------------------------------------------------------------
revno: 117738
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2014-08-25 12:48:08 -0400
message:
  * vc-git.el: Comments.
modified:
  lisp/vc/vc-git.el              vcgit.el-20091113204419-o5vbwnq5f7feedwu-5070

=== modified file 'lisp/vc/vc-git.el'
--- a/lisp/vc/vc-git.el 2014-08-13 08:42:33 +0000
+++ b/lisp/vc/vc-git.el 2014-08-25 16:48:08 +0000
@@ -798,6 +798,10 @@
 (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))