Skip to content

Commit

Permalink
test_workspaces: fix merge skew from b7c7b19 + 220292a
Browse files Browse the repository at this point in the history
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
  • Loading branch information
thoughtpolice committed Oct 14, 2023
1 parent f8be0b2 commit 722823a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cli/tests/test_workspaces.rs
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ fn test_workspaces_forget_multi_transaction() {
// the op log should have multiple workspaces forgotten in a single tx
let stdout = test_env.jj_cmd_success(&main_path, &["op", "log", "--limit", "1"]);
insta::assert_snapshot!(stdout, @r###"
@ e18f223ba3d3 [email protected] 2001-02-03 04:05:12.000 +07:00 - 2001-02-03 04:05:12.000 +07:00
@ dd31c8d01c8b [email protected] 2001-02-03 04:05:12.000 +07:00 - 2001-02-03 04:05:12.000 +07:00
│ forget workspaces second, third
│ args: jj workspace forget second third
"###);
Expand Down

0 comments on commit 722823a

Please sign in to comment.