From d129c44c163018ebca52aa404f29065e8b372d0d Mon Sep 17 00:00:00 2001
From: Jinjing <6427696+AmethystLiang@users.noreply.github.com>
Date: Mon, 8 Jun 2026 10:29:51 -0700
Subject: [PATCH] Inline conflict count with snapshot timestamp in review panel

---
 .../src/components/editor/ConflictComponents.tsx      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/components/editor/ConflictComponents.tsx b/src/renderer/src/components/editor/ConflictComponents.tsx
index 8b6ff42f221..efff89a6de8 100644
--- a/src/renderer/src/components/editor/ConflictComponents.tsx
+++ b/src/renderer/src/components/editor/ConflictComponents.tsx
@@ -284,13 +284,14 @@ export function ConflictReviewPanel({
                 </TooltipContent>
               </Tooltip>
             )}
-            <div className="min-w-0">
-              <div className="text-sm font-medium text-foreground">
+            <div className="flex min-w-0 flex-wrap items-baseline gap-x-1.5">
+              <span className="text-sm font-medium text-foreground">
                 {unresolvedCount} unresolved conflict{unresolvedCount === 1 ? '' : 's'}
-              </div>
-              <div className="mt-1 text-xs text-muted-foreground">
+              </span>
+              <span className="text-muted-foreground/50">·</span>
+              <span className="text-xs text-muted-foreground">
                 Snapshot captured at {snapshotTime}.
-              </div>
+              </span>
             </div>
           </div>
           <Button type="button" size="sm" variant="outline" onClick={onRefreshSnapshot}>