dotfiles-misc/protesilaos.dotfiles
1
0
Fork 0
mirror of https://github.com/protesilaos/dotfiles.git synced 2026-09-10 07:16:20 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Gitconfig: use `diff3' for conflict resolution

Browse source
This commit is contained in:
Protesilaos Stavrou 2020-04-12 16:31:10 +03:00
parent 4c4b13b827
commit ce0249cd90
No known key found for this signature in database
GPG key ID: 99BD6459CD5CA3EA
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NO-STOW-git/.gitconfig
View file

@ -6,3 +6,5 @@
excludesfile = ~/.gitignore_global
[commit]
gpgsign = true
[merge]
conflictStyle = diff3