Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Use diff3 conflict resolution style.

  • Loading branch information...
commit ba59716ef7351d79eaa71cb585462d5a1c104190 1 parent 900acb0
@jpr5 jpr5 authored
Showing with 1 addition and 0 deletions.
  1. +1 −0  .gitconfig
View
1  .gitconfig
@@ -62,6 +62,7 @@
prompt = false
[merge]
stat = true
+ conflictstyle = diff3
[rerere]
enabled = 1
autoupdate = 1
Please sign in to comment.
Something went wrong with that request. Please try again.