Skip to content

Commit

Permalink
tests: avoid a use of deprecated jj move
Browse files Browse the repository at this point in the history
  • Loading branch information
martinvonz committed Apr 28, 2024
1 parent 6752402 commit 9503179
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cli/tests/test_diff_command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ fn test_diff_types() {
std::fs::write(&file_path, "foo").unwrap();
test_env.jj_cmd_ok(&repo_path, &["new", "root()"]);
std::fs::write(&file_path, "bar").unwrap();
test_env.jj_cmd_ok(&repo_path, &["move", r#"--to=description("conflict")"#]);
test_env.jj_cmd_ok(&repo_path, &["squash", r#"--into=description("conflict")"#]);

#[cfg(unix)]
{
Expand Down

0 comments on commit 9503179

Please sign in to comment.