We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent 30bdaaa commit 8883585Copy full SHA for 8883585
1 file changed
tests/test_e2e.sh
@@ -282,7 +282,7 @@ assert_conflict_comment_reparent() {
282
local target=$2
283
local merged=$3
284
285
- if echo "$comment" | grep -qxF "uvx 'git-merge-onto>=0.2' --absorbed origin/$target origin/$merged"; then
+ if echo "$comment" | grep -qxF "uvx git-merge-onto origin/$target origin/$merged --absorbed"; then
286
echo >&2 "✅ Verification Passed: conflict comment re-parents origin/$merged onto origin/$target."
287
else
288
echo >&2 "❌ Verification Failed: conflict comment lacks 'uvx 'git-merge-onto>=0.2' --absorbed origin/$target origin/$merged'."
0 commit comments