Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

enables the diff3 conflict style for merges

  • Loading branch information...
commit 63aee85bc0ad61dc830306855fd961399c4b7b77 1 parent 51e43cd
Chris Kau authored

Showing 1 changed file with 6 additions and 12 deletions. Show diff stats Hide diff stats

  1. +6 12 git/gitconfig.symlink
18 git/gitconfig.symlink 100755 → 100644
@@ -53,24 +53,18 @@

0 comments on commit 63aee85

Please sign in to comment.
Something went wrong with that request. Please try again.