Commit c58d80ee authored by Ben Boeckel's avatar Ben Boeckel

test: remove unnecessary variable

parent cf48eb7d
Pipeline #68692 passed with stage
......@@ -553,10 +553,8 @@ fn test_setup_merge_submodule_conflict_resolution() {
.collect::<Vec<_>>(),
&["submodule".to_string()]);
let resolution_commit = CommitId::new(SUBMODULE_RESOLUTION);
if let Conflict::SubmoduleWithFix(_, ref fix) = conflicts[0] {
assert_eq!(fix, &resolution_commit);
assert_eq!(fix, &CommitId::new(SUBMODULE_RESOLUTION));
} else {
panic!("expected the merge from {} into {} have a conflict resolution: {:?}",
topic,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment