Merge remote-tracking branch 'origin/master'

This commit is contained in:
Geoffrey Frogeye 2023-11-23 22:41:45 +01:00
commit 58b4fbcdf0

View file

@ -16,4 +16,9 @@
required = true required = true
[pull] [pull]
ff = only ff = only
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"