felix/dotfiles
1
0
Fork 0
mirror of https://github.com/Stunkymonkey/dotfiles.git synced 2025-10-30 09:52:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

git/config: move to diff3 conflicts

Browse source
This commit is contained in:
Felix Buehler 2023-04-23 14:31:36 +02:00
parent 559db16be5
commit da5f76b070
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
git/gitconfig
View file

@ -9,6 +9,7 @@
[merge] [merge]
defaultToUpstream = true defaultToUpstream = true
tool = vimdiff tool = vimdiff
conflictstyle = diff3
[core] [core]
editor = vim editor = vim
eol = native eol = native