gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-28 04:47:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix comment on a test assertion

Browse Source
This commit is contained in:
Kiril Videlov 2024-10-16 18:55:06 +02:00
parent 666c167e5e
commit d8f10e1513
No known key found for this signature in database
GPG Key ID: A4C733025427C471
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/gitbutler-branch-actions/tests/extra/mod.rs
View File

@ -1009,7 +1009,7 @@ fn merge_vbranch_upstream_conflict() -> Result<()> {
);
assert_eq!(branch1.files.len(), 0);
assert_eq!(branch1.commits.len(), 3); // Local commit + Remote commit + Merge commit + Conflicted uncommited changes
assert_eq!(branch1.commits.len(), 3); // Local commits including the merge commit
assert_eq!(branch1.series[0].patches.len(), 3);
assert_eq!(branch1.series[0].upstream_patches.len(), 0);
assert!(!branch1.conflicted);