aboutsummaryrefslogtreecommitdiff
path: root/.gitconfig
diff options
context:
space:
mode:
authorMarvin Borner2020-09-21 16:07:38 +0200
committerMarvin Borner2020-09-21 16:07:38 +0200
commit54e232bf8b0668edc601763c4ed60be8fffc40a3 (patch)
tree36b2d54945228337debac370d39ba8bb4ed3b48e /.gitconfig
parent7d4e199df2b57b4c7f7cbdacc7792d71bb56a538 (diff)
Laptop sync
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/.gitconfig b/.gitconfig
index 056e73c..d582072 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,5 +6,3 @@
ff = only
[commit]
gpgsign = true
-[merge]
- tool = vimdiff