mdk
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New in git 2.35

This commit is contained in:
Julien Palard 2024-03-15 18:28:38 +01:00
parent a15bee2a49
commit a0a1103ba9
Signed by: mdk
GPG Key ID: 0EFC1AC1006886F8
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.config/git/config
View File

@ -31,7 +31,7 @@
defaultBranch = main
[merge]
conflictstyle = diff3
conflictstyle = zdiff3
[merge "po3way"]
name = po file merge driver