From d8fc9facec50b44c96473c8c4d5089022e8a9cb1 Mon Sep 17 00:00:00 2001
From: Sanchayan Maity <maitysanchayan@gmail.com>
Date: Thu, 17 Sep 2020 10:35:16 +0530
Subject: [PATCH] nvim/git: Use vimdiff as merge tool & drop DiffConflicts

The conflict markers plugin is what we have been using all the time and
is useful even without resorting to merge tool. Drop the DiffConflicts
plugin and use vimdiff as the merge tool if at all we need to resort to
a full 3 way merge view.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
---
 git/.gitconfig             | 9 ++++++---
 nvim/.config/nvim/init.vim | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 26227a7..9154a04 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -13,9 +13,12 @@
 [http]
 	sslVerify = false
 [merge]
-	tool = diffconflicts
-[mergetool "diffconflicts"]
-	cmd = nvim -c "DiffConflicts" "$MERGED" "$BASE" "$LOCAL" "$REMOTE"
+	tool = vimdiff
+	conflictstyle = diff3
+[mergetool]
+	prompt = false
+[mergetool "vimdiff"]
+	cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
 	trustExitCode = true
 	keepBackup = false
 [commit]
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 30bc646..7b8994c 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -22,7 +22,6 @@ Plug 'rhysd/git-messenger.vim'
 Plug 'tpope/vim-fugitive'
 Plug 'airblade/vim-gitgutter'
 Plug 'rhysd/conflict-marker.vim'
-Plug 'whiteinge/diffconflicts'
 Plug 'salcode/vim-interactive-rebase-reverse'
 Plug 'stsewd/fzf-checkout.vim'
 " Boost vim command line mode