diff options
| author | Tom Tromey <tom@tromey.com> | 2017-02-13 18:09:36 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-02-14 14:07:53 -0700 |
| commit | 3fb9f5452fbd0458f90115b0a95151b8e7a482a1 (patch) | |
| tree | 0821ca2fdd6fe0a65b36a35eb2f30a0a4938393b /test/lisp/emacs-lisp/package-resources/package-test-server.py | |
| parent | 71b90192dab8de9825904faaabbaf9548d3db2ab (diff) | |
| download | emacs-3fb9f5452fbd0458f90115b0a95151b8e7a482a1.tar.gz emacs-3fb9f5452fbd0458f90115b0a95151b8e7a482a1.tar.bz2 emacs-3fb9f5452fbd0458f90115b0a95151b8e7a482a1.zip | |
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.
Diffstat (limited to 'test/lisp/emacs-lisp/package-resources/package-test-server.py')
0 files changed, 0 insertions, 0 deletions