feat(git): better conflict styling

2022-08-28 16:21:52 -05:00 · 2022-08-28 16:21:52 -05:00 · 48a3abb8f6
commit 48a3abb8f6
parent 95e74108b5
1 changed files with 2 additions and 0 deletions
--- a/dots/.gitconfig
+++ b/dots/.gitconfig
@ -46,3 +46,5 @@
    unstage = reset HEAD --
 [push]
    autoSetupRemote = true
+[merge]
+    conflictstyle = diff3