From ad72c4c59c1cca1df07b8d5b34d168626d48553f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Niemier?= <~@hauleth.dev>
Date: Thu, 7 Aug 2025 22:25:00 +0200
Subject: [PATCH] Better JJ conflict format and add commit summary in shortlog

---
 modules/git/ignore | 2 --
 modules/jj.nix     | 7 ++++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/git/ignore b/modules/git/ignore
index bfc1bfe..930927e 100644
--- a/modules/git/ignore
+++ b/modules/git/ignore
@@ -62,8 +62,6 @@ tmp/
 # Other {{{
 .rake_tasks
 .meteor/
-tags
-tags.*
 .gdb_history
 perf.data*
 oprofile_data
diff --git a/modules/jj.nix b/modules/jj.nix
index 045c8fc..e063054 100644
--- a/modules/jj.nix
+++ b/modules/jj.nix
@@ -6,7 +6,11 @@
       user.email = "~@hauleth.dev";
       user.name = "Łukasz Niemier";
 
-      ui.default-command = ["log" "--template=log_compact"];
+      ui = {
+        default-command = ["log" "--template=log_compact"];
+
+        conflict-marker-style = "diff3";
+      };
 
       aliases = {
         record = ["commit"];
@@ -66,6 +70,7 @@
                     if(conflict, label("conflict", "conflict")),
                     if(config("ui.show-cryptographic-signatures").as_boolean(),
                       format_short_cryptographic_signature(signature)),
+                    if(!description && !empty, "\n" ++ diff.summary()),
                   ) ++ "\n",
                 ),
               )
-- 
2.51.2