Update FreeBSD profile with Niri

2026-09-27 19:03:47 +00:00 · 2026-07-15 22:26:29 +02:00
parent fa39a2571b
commit 8eabc5b340
22 changed files with 317 additions and 147 deletions
--- a/ansible/templates/desktop/.gitconfig.j2
+++ b/ansible/templates/desktop/.gitconfig.j2
@@ -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