ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

tests: avoid a use of deprecated jj move

Browse source
This commit is contained in:
Martin von Zweigbergk 2024-04-28 09:58:46 -07:00 committed by Martin von Zweigbergk
parent 6752402113
commit 9503179ea4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/tests/test_diff_command.rs
View file

@ -241,7 +241,7 @@ fn test_diff_types() {
std::fs::write(&file_path, "foo").unwrap(); std::fs::write(&file_path, "foo").unwrap();
test_env.jj_cmd_ok(&repo_path, &["new", "root()"]); test_env.jj_cmd_ok(&repo_path, &["new", "root()"]);
std::fs::write(&file_path, "bar").unwrap(); 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)] #[cfg(unix)]
{ {