Permalink
Browse files

Revert "Revert a mac-only setting"

This reverts commit 37411db.
  • Loading branch information...
1 parent 5bea474 commit 58933ad26294959bf921fa5d94958efe04369d65 Ian Young committed Mar 14, 2011
Showing with 2 additions and 0 deletions.
  1. +2 −0 .gitconfig
View
2 .gitconfig
@@ -36,6 +36,8 @@
[diff "php"]
wordRegex = \\${0,2}[[:alnum:]_]+|::|->|[^[:space:]]
[merge "tool"]
+[mergetool "gvimdiff"]
+ path = mvim
[merge]
tool = gvimdiff
[gc]

0 comments on commit 58933ad

Please sign in to comment.