From cf88659f30047c187a7e776518a165d5498711c2 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Fri, 18 Dec 2020 13:56:14 +0530
Subject: [PATCH] nvim: colors: yolokai: Add highlighting for conflict-markers

---
 nvim/.config/nvim/colors/yolokai.vim | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nvim/.config/nvim/colors/yolokai.vim b/nvim/.config/nvim/colors/yolokai.vim
index 5d3dd4f..c064c0a 100644
--- a/nvim/.config/nvim/colors/yolokai.vim
+++ b/nvim/.config/nvim/colors/yolokai.vim
@@ -612,6 +612,13 @@ local highlight_groups = {
 	WhichKeyGroup     = 'Keyword'  ,
 	WhichKeyDesc      = {bg=black,  fg=orange, style=NONE },
 	WhichKeyFloating  = 'Pmenu'    ,
+
+	--[[ 4.4.12 conflict-marker ]]
+	ConflictMarkerBegin               = {bg=black,  fg=purple,  style=NONE },
+	ConflictMarkerEnd                 = {bg=black,  fg=purple,  style=NONE },
+	ConflictMarkerOurs                = {bg=black,  fg=green,   style=NONE },
+	ConflictMarkerTheirs              = {bg=black,  fg=red,     style=NONE },
+	ConflictMarkerCommonAncestorsHunk = {bg=black,  fg=orange,  style=NONE },
 }
 
 -- We do not care about terminals which do not support 256 colors