jdkaplan/dotfiles
1
0
Fork 0
Code Activity

git conflict style

Browse source
This commit is contained in:
Jeremy Kaplan 2018-01-16 21:08:50 -08:00
commit 16cc033c26
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
git/config
View file

@ -25,3 +25,5 @@
[includeIf "gitdir:~/projects/"] [includeIf "gitdir:~/projects/"]
path = config-personal path = config-personal
[merge]
conflictStyle = diff3