()
| 562 | |
| 563 | #[test] |
| 564 | fn test_begin_conflict() { |
| 565 | let buffer = with_writer(|writer| { |
| 566 | writer.begin_conflict(1, None).unwrap(); |
| 567 | |
| 568 | assert!(writer.has_conflicts()); |
| 569 | assert_eq!(writer.conflict_count(), 1); |
| 570 | assert_eq!(writer.conflicts()[0].conflict_type, FileConflictType::Order); |
| 571 | }); |
| 572 | let output = String::from_utf8(buffer).unwrap(); |
| 573 | assert!(output.contains(">>>>>>> 1")); |
| 574 | } |
| 575 | |
| 576 | #[test] |
| 577 | fn test_begin_zombie_conflict() { |
nothing calls this directly
no test coverage detected