Permalink
Browse files

Use diff3 conflict resolution style.

  • Loading branch information...
jpr5 committed Nov 23, 2010
1 parent 900acb0 commit ba59716ef7351d79eaa71cb585462d5a1c104190
Showing with 1 addition and 0 deletions.
  1. +1 −0 .gitconfig
View
@@ -62,6 +62,7 @@
prompt = false
[merge]
stat = true
+ conflictstyle = diff3
[rerere]
enabled = 1
autoupdate = 1

0 comments on commit ba59716

Please sign in to comment.