branch: elpa/spacemacs-theme
commit d79fa1800c58c4e52b5faa4f4e0400622ef98f5b
Author: nashamri <[email protected]>
Commit: nashamri <[email protected]>
Support smerge (Fix #79)
Thanks @duianto for reporting the issue.
---
spacemacs-common.el | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/spacemacs-common.el b/spacemacs-common.el
index 7aa3e28ca6..4876bb24bb 100644
--- a/spacemacs-common.el
+++ b/spacemacs-common.el
@@ -682,6 +682,15 @@
`(sp-pair-overlay-face ((,class (:background ,highlight :foreground
nil))))
`(sp-show-pair-match-face ((,class (:foreground ,mat :inherit bold
:underline t))))
+;;;;; smerge
+ `(smerge-base ((,class (:background ,yellow-bg))))
+ `(smerge-markers ((,class (:background ,ttip-bg :foreground ,ttip))))
+ `(smerge-mine ((,class (:background ,red-bg))))
+ `(smerge-other ((,class (:background ,green-bg))))
+ `(smerge-refined-added ((,class (:background ,green-bg-s :foreground
,green))))
+ `(smerge-refined-changed ((,class (:background ,blue-bg :foreground
,blue))))
+ `(smerge-refined-removed ((,class (:background ,red-bg-s :foreground
,red))))
+
;;;;; spaceline
`(spaceline-flycheck-error ((,class (:foreground ,err))))
`(spaceline-flycheck-info ((,class (:foreground ,keyword))))
