aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/vc/smerge-mode.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index a16c7871ff9..aad3e302826 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -81,7 +81,7 @@ Used in `smerge-diff-base-upper' and related functions."
81 (((class color) (min-colors 88) (background dark)) 81 (((class color) (min-colors 88) (background dark))
82 :background "#553333" :extend t) 82 :background "#553333" :extend t)
83 (((class color)) 83 (((class color))
84 :foreground "red" :extend)) 84 :foreground "red" :extend t))
85 "Face for the `upper' version of a conflict.") 85 "Face for the `upper' version of a conflict.")
86(define-obsolete-face-alias 'smerge-mine 'smerge-upper "26.1") 86(define-obsolete-face-alias 'smerge-mine 'smerge-upper "26.1")
87(defvar smerge-upper-face 'smerge-upper) 87(defvar smerge-upper-face 'smerge-upper)
@@ -92,7 +92,7 @@ Used in `smerge-diff-base-upper' and related functions."
92 (((class color) (min-colors 88) (background dark)) 92 (((class color) (min-colors 88) (background dark))
93 :background "#335533" :extend t) 93 :background "#335533" :extend t)
94 (((class color)) 94 (((class color))
95 :foreground "green" :extend)) 95 :foreground "green" :extend t))
96 "Face for the `lower' version of a conflict.") 96 "Face for the `lower' version of a conflict.")
97(define-obsolete-face-alias 'smerge-other 'smerge-lower "26.1") 97(define-obsolete-face-alias 'smerge-other 'smerge-lower "26.1")
98(defvar smerge-lower-face 'smerge-lower) 98(defvar smerge-lower-face 'smerge-lower)