()
| 993 | |
| 994 | #[test] |
| 995 | fn merge3_overlap_conflicts() { |
| 996 | let base = b"anchor me\nmiddle v1\n"; |
| 997 | let ours = b"anchor me\nmiddle carried v1\n"; |
| 998 | let theirs = b"anchor me\n"; |
| 999 | assert!(merge_text(base, ours, theirs).is_err()); |
| 1000 | } |
| 1001 | } |
nothing calls this directly
no outgoing calls
no test coverage detected