From 9ef710390b1d386d263a2d02033ff2562569f5a5 Mon Sep 17 00:00:00 2001
From: NicolasGB <ngou0210@gmail.com>
Date: Wed, 12 Nov 2025 14:08:52 +0100
Subject: [PATCH] =?UTF-8?q?feat(log):=20add=20conflict=20symbol=20=C3=97?=
 =?UTF-8?q?=20(U+00D7)=20to=20revision=20parser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/jj/cmd.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lua/jj/cmd.lua b/lua/jj/cmd.lua
index deaca3b..bc33ba5 100644
--- a/lua/jj/cmd.lua
+++ b/lua/jj/cmd.lua
@@ -119,8 +119,9 @@ end
 local function get_rev_from_log_line(line)
 	-- Define jujutsu symbols with their UTF-8 byte sequences
 	local jj_symbols = {
-		diamond = "\226\151\134", -- ◆
-		circle = "\226\151\139", -- ○
+		diamond = "\226\151\134", -- ◆ U+25C6
+		circle = "\226\151\139", -- ○ U+25CB
+		conflict = "\195\151", -- × U+00D7
 	}
 
 	local revset