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

Add git merge.conflictStyle

master
May B. 2020-04-07 16:45:44 +02:00
parent a23c7d531a
commit 132aeb1789
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 Normal file
View File

@ -0,0 +1,2 @@
[merge]
conflictStyle = diff3