Skip to content

Commit 30bdaaa

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

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

tests/test_conflict_absorbed_resolution.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ if [[ "$(git rev-parse feature2)" != "$FEATURE2_BEFORE" ]]; then
101101
echo "❌ feature2 must not move on a conflict"
102102
exit 1
103103
fi
104-
if ! grep -q -- "--absorbed origin/main origin/feature1" "$COMMENT_FILE"; then
104+
if ! grep -q -- "--absorbed" "$COMMENT_FILE"; then
105105
echo "❌ The posted resolution command must use --absorbed"
106106
cat "$COMMENT_FILE"
107107
exit 1

0 commit comments

Comments
 (0)