me/dots
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
master
dots/.gitconfig
Me 132aeb1789 Add git merge.conflictStyle
2020-04-07 16:45:44 +02:00

3 lines
31 B
INI
Raw Permalink Blame History

[merge]
conflictStyle = diff3
Reference in New Issue View Git Blame Copy Permalink