xtex/config
1
0
Fork 0
Code Activity

Use 3-way merge

Browse source
This commit is contained in:
xtex 2024-01-01 08:52:46 +08:00
parent 2a18fa030d
commit 21e8696c67
Signed by: xtex
GPG key ID: B918086ED8045B91
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitconfig
View file

@ -16,3 +16,5 @@
insteadof = https://github.com/
[pull]
rebase = false
[merge]
conflictstyle = diff3