test_workspaces: fix merge skew from b7c7b19e + 220292ad #2379
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Summary: Yuya's changes and mine had a semantic conflict ("merge skew") between
the two of them, as b7c7b19 changed the `op log `output slightly, whereas
220292a included a new test that used `op log` itself.
Generated by `cargo insta review`.
Signed-off-by: Austin Seipp <[email protected]>
Change-Id: I51d4de7316b1abc09be4f9fa0dd0d1a1
martinvonz
approved these changes
Oct 14, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary: Yuya's changes and mine had a semantic conflict ("merge skew") between the two of them, as b7c7b19 changed the
op logoutput slightly, whereas 220292a included a new test that usedop logitself.Generated by
cargo insta review.Checklist
If applicable:
CHANGELOG.md