chore: updating dependencies, adding merge config, adding fnox tool

2026-05-13 10:38:44 -07:00
parent 210763ae2d
commit cebafd29d6
4 changed files with 80 additions and 70 deletions
@@ -7,3 +7,12 @@

 [edit]
    command = "nvim"
+
+[merge]
+    command = "bcomp"
+    args = [
+        {{ printf "%q" "{{ .Destination }}" }},
+        {{ printf "%q" "{{ .Source }}" }},
+        {{ printf "%q" "{{ .Target }}" }},
+        {{ printf "%q" "{{ .Source }}" }},
+    ]