sogun/chezmoi
1
0
Fork 0
Code Activity

git: mergetool

Browse source
This commit is contained in:
Vladimír Dudr 2022-06-03 10:04:06 +02:00
parent 35cf5ebcfd
commit 36c5d7617b
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dot_config/git/config
View file

@ -37,3 +37,7 @@
smtpserver = /usr/bin/msmtp smtpserver = /usr/bin/msmtp
smtpserveroption = -a smtpserveroption = -a
smtpserveroption = tdj smtpserveroption = tdj
[merge]
tool = vimdiff
conflictstyle = diff3