diff --git a/asyncgit/src/sync/merge.rs b/asyncgit/src/sync/merge.rs index bb6e5d2f..93d73bb3 100644 --- a/asyncgit/src/sync/merge.rs +++ b/asyncgit/src/sync/merge.rs @@ -118,6 +118,7 @@ mod tests { create_branch, tests::{repo_init, write_commit_file}, }; + use pretty_assertions::assert_eq; #[test] fn test_smoke() { @@ -134,6 +135,10 @@ mod tests { merge_branch(repo_path, "master").unwrap(); + let msg = merge_msg(repo_path).unwrap(); + + assert_eq!(&msg[0..12], "Merge branch"); + let mergeheads = mergehead_ids(repo_path).unwrap(); assert_eq!(mergeheads[0], c1);