Add git merge.conflictStyle
This commit is contained in:
parent
a23c7d531a
commit
132aeb1789
|
@ -0,0 +1,2 @@
|
||||||
|
[merge]
|
||||||
|
conflictStyle = diff3
|
Loading…
Reference in New Issue