Skip to content
Browse files

[git] やっぱ vimmdiff の方がいい

  • Loading branch information...
1 parent a7a774f commit a991ca833f4ccc917da54996ddd7f711eea58103 @Jxck committed Mar 17, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 .gitconfig
View
2 .gitconfig
@@ -15,7 +15,7 @@
editor = vim
[merge]
keepBackup = false
- tool = p4merge
+ tool = vimdiff
[mergetool]
keepBackup = false
[mergetool "p4merge"]

0 comments on commit a991ca8

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