From dffe0699859b84418a7ca50d6eb77b3068a7d38e Mon Sep 17 00:00:00 2001
From: Martin von Zweigbergk <martinvonz@google.com>
Date: Sun, 13 Aug 2023 12:16:09 -0700
Subject: [PATCH] conflicts: remove redundant check of `num_sides` from
 condition

Since `Merge` always has one more "adds" than "removes", there's no
need to check both of them. I really should have noticed this in
0b3b62a777ba.
---
 lib/src/conflicts.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/src/conflicts.rs b/lib/src/conflicts.rs
index 3dc5066ab..696ba96ac 100644
--- a/lib/src/conflicts.rs
+++ b/lib/src/conflicts.rs
@@ -205,7 +205,7 @@ pub fn parse_conflict(input: &[u8], num_sides: usize) -> Option<Vec<Merge<Conten
         } else if conflict_start.is_some() && line == CONFLICT_END_LINE {
             let conflict_body = &input[conflict_start.unwrap() + CONFLICT_START_LINE.len()..pos];
             let hunk = parse_conflict_hunk(conflict_body);
-            if hunk.removes().len() + 1 == num_sides && hunk.adds().len() == num_sides {
+            if hunk.adds().len() == num_sides {
                 let resolved_slice = &input[resolved_start..conflict_start.unwrap()];
                 if !resolved_slice.is_empty() {
                     hunks.push(Merge::resolved(ContentHunk(resolved_slice.to_vec())));