diff options
| author | Jesse Luehrs <doy@tozt.net> | 2009-08-12 19:06:07 -0500 |
|---|---|---|
| committer | Jesse Luehrs <doy@tozt.net> | 2009-08-12 19:06:07 -0500 |
| commit | 2615cf72e008b33ebec8ddb988dc3d9e9510084a (patch) | |
| tree | 2dc346ca6fa13d7cb913f8b1ea00ec4f304ccc1f /gitconfig | |
| parent | 57438115fd94e61ec85e036c1be6463aa582bdb0 (diff) | |
| download | conf-2615cf72e008b33ebec8ddb988dc3d9e9510084a.tar.gz conf-2615cf72e008b33ebec8ddb988dc3d9e9510084a.zip | |
use vimdiff rather than gvimdiff for git mergetool
Diffstat (limited to 'gitconfig')
| -rw-r--r-- | gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -18,3 +18,5 @@ default = current [branch] autosetuprebase = always +[merge] + tool = vimdiff |