Skip to content

Commit

Permalink
Update bats test.
Browse files Browse the repository at this point in the history
  • Loading branch information
nicktobey committed Apr 9, 2024
1 parent 5dc2086 commit bfe2e3f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion integration-tests/bats/sql-cherry-pick.bats
Original file line number Diff line number Diff line change
Expand Up @@ -506,5 +506,5 @@ SQL
dolt checkout main
run dolt sql -q "CALL DOLT_CHERRY_PICK('branch1')"
[ $status -eq 1 ]
[[ $output =~ "error: cannot merge because table t has different primary keys" ]] || false
[[ $output =~ "error: cannot merge because table test has different primary keys" ]] || false
}

0 comments on commit bfe2e3f

Please sign in to comment.