git/gitconfig: Set merge.conflictstyle to diff3.

blackwinter · Dec 21, 2016 · 74bd5b7 · 74bd5b7
1 parent e3d6d0d
commit 74bd5b7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/git/gitconfig b/git/gitconfig
@@ -20,6 +20,8 @@
 [diff]
   algorithm = patience
   compactionHeuristic = true
+[merge]
+  conflictstyle = diff3
 [push]
   default   = current