mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-27 14:57:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

conflicts: add test for materializing modify/delete conflict

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-02-17 09:51:14 -08:00 committed by Martin von Zweigbergk
parent dfcc7a9cee
commit e1d71c3713
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/tests/test_conflicts.rs
View file

@ -191,6 +191,21 @@ line 5
line 5
"###
);
// modify/delete conflict at the file level
let conflict = Conflict {
removes: vec![file_conflict_part(&base_id)],
adds: vec![file_conflict_part(&modified_id)],
};
// TODO: THis should have context around the conflict (#1244)
insta::assert_snapshot!(&materialize_conflict_string(store, &path, &conflict), @r###"
<<<<<<<
%%%%%%%
-line 3
+modified
>>>>>>>
"###
);
}
#[test]