mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 02:04:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

files: add another test of a 5-way merge

Browse source 
Just to show that this case doesn't change in the next commit.
This commit is contained in:
Martin von Zweigbergk 2023-05-23 21:21:28 -07:00 committed by Martin von Zweigbergk
parent 1ec906b114
commit 61c1b9f4eb
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/src/files.rs
View file

@ -430,5 +430,13 @@ mod tests {
adds: vec![b"c".to_vec(), b"d".to_vec(), b"e".to_vec()] adds: vec![b"c".to_vec(), b"d".to_vec(), b"e".to_vec()]
})]) })])
); );
// Two sides made the same change, third side made a different change
assert_eq!(
merge(&[b"a", b"b"], &[b"c", b"c", b"c"]),
MergeResult::Conflict(vec![MergeHunk::Conflict(ConflictHunk {
removes: vec![b"a".to_vec(), b"b".to_vec()],
adds: vec![b"c".to_vec(), b"c".to_vec(), b"c".to_vec()]
})])
);
} }
} }