Merge remote-tracking branch 'origin/master'

2023-11-23 22:41:45 +01:00 · 2023-11-23 22:41:45 +01:00 · 58b4fbcdf0
parent 65d1594ec9 dc6af1cb63
commit 58b4fbcdf0
1 changed files with 6 additions and 1 deletions
--- a/config/git/config
+++ b/config/git/config
@ -16,4 +16,9 @@
 	required = true
 [pull]
 	ff = only
-
+[diff]
+    tool = meld
+[difftool]
+    prompt = false
+[difftool "meld"]
+    cmd = meld "$LOCAL" "$REMOTE"