master 0f2d877: Recompute mode-lines when marking conflicts resolved

[Dmitry Gutov]

branch: master
commit 0f2d87716a2cb6fae5ea6719763441c448fe7a74
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    Recompute mode-lines when marking conflicts resolved
    
    * lisp/vc/vc.el (vc-mark-resolved):
    Recompute the mode lines of the affected files.
---
 lisp/vc/vc.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index bc9f112..00976a0 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1549,6 +1549,9 @@ After check-out, runs the normal hook `vc-checkout-hook'."
          (vc-call-backend backend 'mark-resolved files)
          ;; FIXME: Is this TRTD?  Might not be.
          `((vc-state . edited)))
+    ;; Recompute mode lines.
+    (dolist (file files)
+      (vc-mode-line file backend))
     (message
      (substitute-command-keys
       "Conflicts have been resolved in %s.  \