me
/
dots
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
dots/.gitconfig

3 lines
31 B
INI
Raw Normal View History

Add git merge.conflictStyle
2020-04-07 14:45:44 +00:00
[merge]
conflictStyle = diff3