[nongnu] elpa/apropospriate-theme 9845822 084/118: add smerge theming

[ELPA Syncer]

branch: elpa/apropospriate-theme
commit 98458227a965f599e22be2c0979506dbaf39a854
Author: justin talbott <justin@waymondo.com>
Commit: justin talbott <justin@waymondo.com>

    add smerge theming
---
 README.md        | 1 +
 apropospriate.el | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 9c824b3..aeee1c0 100644
--- a/README.md
+++ b/README.md
@@ -92,3 +92,4 @@ Apropospriate supports all the usual `prog-mode` derived 
packages as well as som
 * Symbol Overlay
 * Counsel CSS
 * Ivy Posframe
+* Smerge
diff --git a/apropospriate.el b/apropospriate.el
index 5a81024..615def7 100644
--- a/apropospriate.el
+++ b/apropospriate.el
@@ -435,6 +435,11 @@ Set to `1.0' or nil to prevent font size manipulation."
      `(magit-item-highlight ((,class (:background ,highlight-line-color))))
      `(git-commit-summary ((,class (:foreground ,base03))))
      `(git-timemachine-minibuffer-detail-face ((,class (:foreground ,orange))))
+     `(smerge-markers ((,class (:inherit highlight))))
+     `(smerge-upper ((,class (:background ,base00-1))))
+     `(smerge-lower ((,class (:background ,base00-1))))
+     `(smerge-refined-removed ((,class (:foreground ,red :background 
,base00-1))))
+     `(smerge-refined-added ((,class (:foreground ,green :background 
,base00-1))))
      `(ediff-current-diff-A ((,class (:foreground ,base03 :background 
,red-1))))
      `(ediff-current-diff-Ancestor ((,class (:foreground ,base03 :background 
,red-1))))
      `(ediff-current-diff-B ((,class (:foreground ,base03 :background 
,green-1))))