Institude Filepath, veonim, and git-diff3-style

2019-04-01 11:05:32 -07:00 · 2019-04-01 11:05:32 -07:00 · fa71de6291
commit fa71de6291
parent ad85172df5
2 changed files with 16 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -20,6 +20,9 @@
 [diff]  
  renamelimit = 0

+[merge]
+  conflictstyle = diff3
+
 [color] 
  diff = auto
  interactive = auto