diff options
| author | Marvin Borner | 2020-09-12 11:32:51 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-09-12 11:32:51 +0200 |
| commit | 7d4e199df2b57b4c7f7cbdacc7792d71bb56a538 (patch) | |
| tree | b90697296d6644f226767b187e4901a8ee2c0d98 /.gitconfig | |
| parent | d33931b884e4ff00daca627aaee924ba8bf44a98 (diff) | |
Some fixes
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -6,3 +6,5 @@ ff = only [commit] gpgsign = true +[merge] + tool = vimdiff |