branch: elpa/magit
commit 2e76ec9337154e0ed6b3bc345e7857e27a4d79bd
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-diff-conflict-heading-highlight: New face
---
lisp/magit-diff.el | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index fffbfde3722..755cd6dea5d 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -651,6 +651,11 @@ loss of information. Good properties to set here are
`:weight'
and `:slant'."
:group 'magit-faces)
+(defface magit-diff-conflict-heading-highlight
+ '((t :inherit magit-diff-hunk-heading-highlight))
+ "Face for conflict markers."
+ :group 'magit-faces)
+
(defface magit-diff-revision-summary
'((t :inherit magit-diff-hunk-heading))
"Face for commit message summaries."
@@ -3374,7 +3379,9 @@ actually a `diff' but a `diffstat' section."
('("=" nil) 'magit-diff-their)
('("=" t) 'magit-diff-their-highlight)
('(">" nil) nil)))
- 'magit-diff-conflict-heading)
+ (if highlight
+ 'magit-diff-conflict-heading-highlight
+ 'magit-diff-conflict-heading))
((looking-at (if merging "^\\(\\+\\| \\+\\)" "^\\+"))
(magit-diff-paint-tab merging tab-width)
(magit-diff-paint-whitespace merging 'added diff-type)
