diff options
| author | Johannes Ranke <jranke@uni-bremen.de> | 2016-11-12 16:25:11 +0100 |
|---|---|---|
| committer | Johannes Ranke <jranke@uni-bremen.de> | 2016-11-12 16:25:11 +0100 |
| commit | 63c5cc6cd0e467186b9a8dbf3ae1702453ca13aa (patch) | |
| tree | 83059ef34f4360464371d7fbab1bf7e823fdc937 | |
| parent | 7ce7aae09dab2195f5a337c2df9faff955633e81 (diff) | |
Use vimdiff for merging
| -rw-r--r-- | gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -7,3 +7,5 @@ [core] excludesfile = ~/.gitignore autocrlf = input +[merge] + tool = vimdiff |