Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
f330aa15
Commit
f330aa15
authored
Aug 25, 2014
by
Glenn Morris
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* vc-git.el: Comments.
parent
42ee94e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
0 deletions
+4
-0
lisp/vc/vc-git.el
lisp/vc/vc-git.el
+4
-0
No files found.
lisp/vc/vc-git.el
View file @
f330aa15
...
...
@@ -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))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment