()
| 609 | |
| 610 | #[test] |
| 611 | fn test_full_conflict_sequence() { |
| 612 | let buffer = with_writer(|writer| { |
| 613 | writer.begin_conflict(1, None).unwrap(); |
| 614 | writer.write_all(b"Side A\n").unwrap(); |
| 615 | writer.conflict_next(1, None).unwrap(); |
| 616 | writer.write_all(b"Side B\n").unwrap(); |
| 617 | writer.end_conflict(1).unwrap(); |
| 618 | }); |
| 619 | let output = String::from_utf8(buffer).unwrap(); |
| 620 | assert!(output.contains(">>>>>>> 1")); |
| 621 | assert!(output.contains("Side A")); |
| 622 | assert!(output.contains("======= 1")); |
| 623 | assert!(output.contains("Side B")); |
| 624 | assert!(output.contains("<<<<<<< 1")); |
| 625 | } |
| 626 | |
| 627 | #[test] |
| 628 | fn test_ensure_line_start_before_marker() { |
nothing calls this directly
no test coverage detected