diff options
Diffstat (limited to 'lisp/vc/vc-git.el')
| -rw-r--r-- | lisp/vc/vc-git.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 060072ea54d..6b6f0f8d12c 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -978,7 +978,7 @@ This prompts for a branch to merge from." ;; FIXME ;; 1) the net result is to call git twice per file. ;; 2) v-g-c-f is documented to take a directory. - ;; https://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html + ;; https://lists.gnu.org/r/emacs-devel/2014-01/msg01126.html (vc-git-conflicted-files buffer-file-name) (save-excursion (goto-char (point-min)) |