kellya/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change diff3 to zdiff3

Browse source
This commit is contained in:
Alex Kelly 2024-02-16 20:48:17 -05:00
parent 49354af35e
commit 57c53f47ac
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dot_gitconfig.tmpl
View file

@ -51,4 +51,4 @@
[help]
autocorrect = 20
[merge]
conflictstyle = diff3
conflictstyle = zdiff3