Permalink
Browse files

Use diff3 for displaying git conflicts

  • Loading branch information...
1 parent a644ba4 commit 58b51e8ce49e2c4c24c1912700f573c2d63ed9e8 @mocoso committed Apr 5, 2012
Showing with 1 addition and 0 deletions.
  1. +1 −0 home/.gitconfig
View
@@ -20,6 +20,7 @@
interactive = auto
[merge]
tool = opendiff
+ conflictstyle = diff3
[color "interactive"]
prompt = magenta
[push]

0 comments on commit 58b51e8

Please sign in to comment.