From 5f6d0202ec3250d1fce06f63d7a087e435c0d74c Mon Sep 17 00:00:00 2001 From: Miguel Date: Sun, 9 Jun 2019 15:00:23 +0200 Subject: updates --- git/.gitconfig | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'git') diff --git a/git/.gitconfig b/git/.gitconfig index 58dcb03..4d656b1 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -3,3 +3,21 @@ # Please adapt and uncomment the following lines: name = Miguel email = m.i@gmx.at +[merge] + tool = vimdiff + conflictstyle = diff3 + + +[mergetool] + prompt = true + +[mergetool "vimdiff"] + cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd w' -c '$wincmd w' -c '$wincmd J' + +[difftool] + prompt = false + +[diff] + tool = vimdiff + + -- cgit v1.2.3