From c305c5e91ba3f1ac4b6a1941d2d2c9678d895951 Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Tue, 25 Feb 2014 12:04:53 +0100
Subject: Add smerge faces

---
 yoshi-theme.el | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/yoshi-theme.el b/yoshi-theme.el
index 7a5c10f..4ae9637 100644
--- a/yoshi-theme.el
+++ b/yoshi-theme.el
@@ -274,6 +274,13 @@
    `(slime-repl-inputed-output-face ((t (:foreground ,fgbright))))
    `(slime-repl-output-face ((t (:foreground ,fgdefault))))
    `(slime-repl-prompt-face ((t (:foreground ,fgblue))))
+   `(smerge-base ((t (:background ,bggreen))))
+   `(smerge-markers ((t (:background ,bgbright))))
+   `(smerge-mine ((t (:background ,bgblue))))
+   `(smerge-other ((t (:background ,bgred))))
+   `(smerge-refined-added ((t (:inherit diff-refine-added))))
+   `(smerge-refined-change ((t (:inherit diff-refine-change))))
+   `(smerge-refined-removed ((t (:inherit diff-refine-removed))))
    `(success ((t (:foreground ,fggreen :weight bold))))
    `(term-color-black ((t (:background ,bgdefault :foreground ,fgbright))))
    `(term-color-blue ((t (:background ,bgblue :foreground ,fgblue))))
-- 
cgit v1.2.3-54-g00ecf