aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/vc/vc.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index bc9f11202b1..00976a07d42 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'."
1549 (vc-call-backend backend 'mark-resolved files) 1549 (vc-call-backend backend 'mark-resolved files)
1550 ;; FIXME: Is this TRTD? Might not be. 1550 ;; FIXME: Is this TRTD? Might not be.
1551 `((vc-state . edited))) 1551 `((vc-state . edited)))
1552 ;; Recompute mode lines.
1553 (dolist (file files)
1554 (vc-mode-line file backend))
1552 (message 1555 (message
1553 (substitute-command-keys 1556 (substitute-command-keys
1554 "Conflicts have been resolved in %s. \ 1557 "Conflicts have been resolved in %s. \