From cfe900edbe4b4577cf6f3e0bee6a9135a61bb230 Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Sat, 4 Dec 2021 11:37:58 -0500 Subject: Add InMergeConflict to combined diff enum variant This allows keep-plus-minus-markers=false to be honored inside merge conflicts but not honored for combined diff regions outside merge conflicts. --- src/handlers/diff_header_diff.rs | 7 +++++-- 1 file changed, 5 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 56195e7..7136716 100644 --- a/src/handlers/diff_header_diff.rs +++ b/src/handlers/diff_header_diff.rs @@ -1,4 +1,4 @@ -use crate::delta::{DiffType, MergeParents, State, StateMachine}; +use crate::delta::{DiffType, InMergeConflict, MergeParents, State, StateMachine}; impl<'a> StateMachine<'a> { #[inline] @@ -15,7 +15,10 @@ impl<'a> StateMachine<'a> { self.state = if self.line.starts_with("diff --cc ") || self.line.starts_with("diff --combined ") { // We will determine the number of parents when we see the hunk header. - State::DiffHeader(DiffType::Combined(MergeParents::Unknown)) + State::DiffHeader(DiffType::Combined( + MergeParents::Unknown, + InMergeConflict::No, + )) } else { State::DiffHeader(DiffType::Unified) }; -- cgit v1.2.3