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.

1 files changed, 5 insertions, 2 deletions

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)
             };