summaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
authorMarc Coquand <marc@mccd.space>2024-09-05 12:15:30 -0500
committerMarc Coquand <marc@mccd.space>2024-09-05 12:15:30 -0500
commit3783cab095a9167256afcbfe987d11f35a7003b1 (patch)
tree73a65b01330ba28777aef62c39446eba80817536 /gitconfig
parent1c1bab4e0f73aadec8def78a5313d22e1fb9462f (diff)
downloadbsd-netbsd.tar.gz
bsd-netbsd.tar.bz2
bsd-netbsd.zip
changesnetbsd
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 13f29c4..99a675c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -14,6 +14,8 @@
helper = !pass 'fastmail/git'
[color]
ui = false
+[merge]
+ tool = meld
[mergetool]
layout = LOCAL,MERGED,REMOTE
[sendemail]