From 9b2fb46c3175f2d991dc0e6033cbb87dc1dcb8a1 Mon Sep 17 00:00:00 2001
From: Neil <4138956+nwparker@users.noreply.github.com>
Date: Thu, 3 Sep 2026 20:42:21 -0700
Subject: [PATCH] fix(test): import the conflict parser statically so the CJS
 cli project compiles

---
 src/shared/git-status-conflict-entries.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/git-status-conflict-entries.test.ts b/src/shared/git-status-conflict-entries.test.ts
index 7a53c1cf6a9..ce6b5ab9e9e 100644
--- a/src/shared/git-status-conflict-entries.test.ts
+++ b/src/shared/git-status-conflict-entries.test.ts
@@ -13,7 +13,7 @@ vi.mock('node:fs/promises', async (importOriginal) => ({
   access: accessMock
 }))
 
-const { parseUnmergedEntry } = await import('./git-status-conflict-entries')
+import { parseUnmergedEntry } from './git-status-conflict-entries'
 
 const WORKTREE = '/repo'