Improve git diff tooling, add jj config

2026-03-13 00:17:10 +01:00 · 2026-03-13 00:17:10 +01:00 · 5d8d946d3e
commit 5d8d946d3e
parent 29371f8ed2
4 changed files with 31 additions and 9 deletions
--- a/jj/config.toml
+++ b/jj/config.toml
@ -0,0 +1,17 @@
+[user]
+name = "Martin Larsson"
+email = "larssonmartin1998@gmail.com"
+
+[ui]
+editor = "nvim"
+pager = "delta"
+diff-formatter = ":git"
+default-command = "log"
+
+[diff]
+context-lines = 10
+
+[merge-tools.nvim]
+program = "nvim"
+merge-args = ["$output"]
+merge-tool-edits-conflict-markers = true