From 939486ef5428db23b3573f5419cdb37dc9bfb7f9 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Mon, 13 Jan 2020 19:26:04 +0530
Subject: [PATCH] nvim: Add diffconflicts plugin

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
---
 nvim/.config/nvim/init.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 6fe330a..e187fc5 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -38,6 +38,7 @@ Plug 'junegunn/gv.vim'
 Plug 'rhysd/git-messenger.vim'
 Plug 'christoomey/vim-conflicted'
 Plug 'rbong/vim-flog'
+Plug 'whiteinge/diffconflicts'
 " For tmux yank
 Plug 'vim-utils/vim-husk'
 " Tags