Skip to content

Commit 8883585

Browse files
authored
Apply suggestion from @Phlogistique
1 parent 30bdaaa commit 8883585

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

tests/test_e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ assert_conflict_comment_reparent() {
282282
local target=$2
283283
local merged=$3
284284

285-
if echo "$comment" | grep -qxF "uvx 'git-merge-onto>=0.2' --absorbed origin/$target origin/$merged"; then
285+
if echo "$comment" | grep -qxF "uvx git-merge-onto origin/$target origin/$merged --absorbed"; then
286286
echo >&2 "✅ Verification Passed: conflict comment re-parents origin/$merged onto origin/$target."
287287
else
288288
echo >&2 "❌ Verification Failed: conflict comment lacks 'uvx 'git-merge-onto>=0.2' --absorbed origin/$target origin/$merged'."

0 commit comments

Comments
 (0)