fscotto/infra
1
0
Fork 0
mirror of https://github.com/fscotto/infra.git synced 2026-07-29 16:20:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update FreeBSD profile with Niri

Browse Source
This commit is contained in:
Fabio Scotto di Santolo
2026-07-15 22:26:29 +02:00
parent fa39a2571b
commit 8eabc5b340
22 changed files with 317 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ansible/templates/desktop/.gitconfig.j2
View File

@@ -29,9 +29,19 @@
[mergetool]
prompt = false
[mergetool "meld"]
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
trustExitCode = false
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE"
[color]
ui = always