From c46dafa76e5e043cb2a879a9e346b654a12692a9 Mon Sep 17 00:00:00 2001 From: Martin von Zweigbergk Date: Sun, 28 Apr 2024 09:58:46 -0700 Subject: [PATCH] tests: avoid a use of deprecated `jj move` --- cli/tests/test_diff_command.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/tests/test_diff_command.rs b/cli/tests/test_diff_command.rs index bf5e747394..16ad9f7a04 100644 --- a/cli/tests/test_diff_command.rs +++ b/cli/tests/test_diff_command.rs @@ -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)] {