dotfiles

My personal shell configs and stuff
git clone git://git.alex.balgavy.eu/dotfiles.git
Log | Files | Refs | Submodules | README | LICENSE
commit 05e75c41e20b2767999668ffe20398ba4691653b
parent bbf024d525cc87ae5a6c731e71cb1b073b683b46
Author: Alex Balgavy <alex@balgavy.eu>
Date:   Sun, 24 Apr 2022 17:48:29 +0200

git: use diff3 style for conflicts

Diffstat:

Mgit/gitconfig | 1+


1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/git/gitconfig b/git/gitconfig
@@ -97,6 +97,7 @@
 
 [merge]
     tool = vimdiff
+    conflictstyle = diff3
 
 [core]
     autocrlf = input