From 6745f42ddadeccfa30628c70d39b8f9abbff35f0 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Mon, 29 Nov 2021 20:54:48 -0500 Subject: Display merge conflicts --- src/handlers/diff_header_diff.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/handlers/diff_header_diff.rs') diff --git a/src/handlers/diff_header_diff.rs b/src/handlers/diff_header_diff.rs index 869e40e..56195e7 100644 --- a/src/handlers/diff_header_diff.rs +++ b/src/handlers/diff_header_diff.rs @@ -1,4 +1,4 @@ -use crate::delta::{DiffType, State, StateMachine}; +use crate::delta::{DiffType, MergeParents, State, StateMachine}; impl<'a> StateMachine<'a> { #[inline] @@ -14,7 +14,8 @@ impl<'a> StateMachine<'a> { self.painter.paint_buffered_minus_and_plus_lines(); self.state = if self.line.starts_with("diff --cc ") || self.line.starts_with("diff --combined ") { - State::DiffHeader(DiffType::Combined(2)) // We will confirm the number of parents when we see the hunk header + // We will determine the number of parents when we see the hunk header. + State::DiffHeader(DiffType::Combined(MergeParents::Unknown)) } else { State::DiffHeader(DiffType::Unified) }; -- cgit v1.2.3