Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[git] diff3 for diff

  • Loading branch information...
commit e2e0e7a17d5ff0c5502c3b9fbcdb5ff2b7c1859c 1 parent 623df21
@jamesonjlee authored
Showing with 2 additions and 0 deletions.
  1. +2 −0  gitconfig
View
2  gitconfig
@@ -19,3 +19,5 @@
whitespace=fix,-indent-with-non-tab,trailing-space,cr-at-eol
[branch]
autosetuprebase = always
+[merge]
+ conflictstyle = diff3
Please sign in to comment.
Something went wrong with that request. Please try again.