Tom Tromey 3fb9f5452f 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.

2017-02-14 14:07:53 -07:00

..

add-log.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

compare-w.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

cvs-status.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

diff-mode.el

Check if there are hunks before kill or refine a hunk

2017-02-02 22:27:33 +09:00

diff.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

ediff-diff.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

ediff-help.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

ediff-hook.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

ediff-init.el

ediff-difference-vector-alist: Drop duplicated definition

2017-01-25 15:15:16 +09:00

ediff-merg.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

ediff-mult.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

ediff-ptch.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

ediff-util.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

ediff-vers.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

ediff-wind.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

ediff.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

emerge.el

; Replace "25.2" with "26.1" where appropriate, which is almost everywhere

2016-11-17 22:50:40 -08:00

log-edit.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

log-view.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

pcvs-defs.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

pcvs-info.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

pcvs-parse.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

pcvs-util.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

pcvs.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

smerge-mode.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

vc-annotate.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

vc-bzr.el

Remove leftover references to log-view-message-face

2017-01-14 06:56:37 +03:00

vc-cvs.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

vc-dav.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

vc-dir.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

vc-dispatcher.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

vc-filewise.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

vc-git.el

Make vc-git detect conflict state for vc-dir

2017-02-14 14:07:53 -07:00

vc-hg.el

Remove leftover references to log-view-message-face

2017-01-14 06:56:37 +03:00

vc-hooks.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

vc-mtn.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

vc-rcs.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

vc-sccs.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

vc-src.el

Merge from origin/emacs-25

2017-01-01 01:10:47 -08:00

vc-svn.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00

vc.el

Update copyright year to 2017

2016-12-31 19:42:26 -08:00