From 5e80e549cda598de69a59c38e29f8960a73547fa Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Tue, 9 Jun 2026 21:30:39 +0000
Subject: [PATCH] Fix e2e merge-command assertion broken by the ff-only step
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since #40 the conflict comment's fast-forward step reads `git merge
--ff-only origin/<branch>`, which assert_conflict_comment_merges picks
up with its `^git merge` grep, so the extracted commands never match the
expected conflict merges and the check fails on every conflict scenario.
Skip the --ff-only line when extracting.

This went unnoticed because tests.yml only runs on pull_request, so the
breakage only surfaced on the first PR after #40 landed.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

https://claude.ai/code/session_01JHvKryT4QUpHYdNq9YEQxX
---
 tests/test_e2e.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_e2e.sh b/tests/test_e2e.sh
index 1da4439..420f2cd 100755
--- a/tests/test_e2e.sh
+++ b/tests/test_e2e.sh
@@ -291,7 +291,7 @@ assert_conflict_comment_merges() {
         expected+="git merge $conflict"$'\n'
     done
     expected=${expected%$'\n'}
-    actual=$(echo "$comment" | grep -E '^git merge' | sed 's/ *#.*//' || true)
+    actual=$(echo "$comment" | grep -E '^git merge' | grep -v -- '--ff-only' | sed 's/ *#.*//' || true)
 
     if [[ "$actual" == "$expected" ]]; then
         echo >&2 "✅ Verification Passed: conflict comment lists expected merge command(s)."