Use 3-way merge
This commit is contained in:
parent
2a18fa030d
commit
21e8696c67
|
@ -16,3 +16,5 @@
|
|||
insteadof = https://github.com/
|
||||
[pull]
|
||||
rebase = false
|
||||
[merge]
|
||||
conflictstyle = diff3
|
||||
|
|
Loading…
Reference in a new issue