Also highlight 'conflict' with the warning face

* lisp/vc/vc-git.el (vc-git-dir-printer):
Also highlight 'conflict' with the warning face, like
vc-default-dir-printer does already.

diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 94fac3a83b84cbf1a4c0b0861d548dad109c2f8b..d00c2c2133c2e9900df2eada18d5f9c00f182240 100644 (file)
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -479,8 +479,8 @@ or an empty string if none."
      (propertize
       (format "%-12s" state)
       'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face)
-                 ((eq state 'missing) 'font-lock-warning-face)
-                 (t 'font-lock-variable-name-face))
+                  ((eq state '(missing conflict)) 'font-lock-warning-face)
+                  (t 'font-lock-variable-name-face))
       'mouse-face 'highlight
       'keymap vc-dir-status-mouse-map)
      "  " (vc-git-permissions-as-string old-perm new-perm)