]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 71b9019) | patch
Make vc-git detect conflict state for vc-dir
authorTom Tromey <tom@tromey.com>
Tue, 14 Feb 2017 01:09:36 +0000 (18:09 -0700)
committerTom Tromey <tom@tromey.com>
Tue, 14 Feb 2017 21:07:53 +0000 (14:07 -0700)
commit3fb9f5452fbd0458f90115b0a95151b8e7a482a1
tree0821ca2fdd6fe0a65b36a35eb2f30a0a4938393btree | snapshot
parent71b90192dab8de9825904faaabbaf9548d3db2abcommit | diff
Make vc-git detect conflict state for vc-dir

* lisp/vc/vc-git.el (vc-git-dir-status-state): New struct.
(vc-git-dir-status-update-file): New function.
(vc-git-after-dir-status-stage, vc-git-dir-status-goto-stage): Use
vc-git-dir-status-state; add 'ls-files-conflict state.
(vc-git-dir-status-files): Create a vc-git-dir-status-state.
lisp/vc/vc-git.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.