diff options
Diffstat (limited to 'lisp/vc/smerge-mode.el')
| -rw-r--r-- | lisp/vc/smerge-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el index cc9c4673345..771281555ab 100644 --- a/lisp/vc/smerge-mode.el +++ b/lisp/vc/smerge-mode.el @@ -116,9 +116,10 @@ Used in `smerge-diff-base-mine' and related functions." (define-obsolete-face-alias 'smerge-markers-face 'smerge-markers "22.1") (defvar smerge-markers-face 'smerge-markers) -(defface smerge-refined-change +(defface smerge-refined-changed '((t nil)) "Face used for char-based changes shown by `smerge-refine'.") +(define-obsolete-face-alias 'smerge-refined-change 'smerge-refined-changed "24.5") (defface smerge-refined-removed '((default |