Omit trivial diffs

martinvonz · Aug 13, 2024 · 6f1379a · 6f1379a
1 parent 73b853a
commit 6f1379a
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/cli/src/diff_util.rs b/cli/src/diff_util.rs
@@ -819,6 +819,19 @@ fn show_structured_conflict_diff_hunks(
                 text = print_context(formatter, text, false)?;
             }
             last_hunk_unmodified_text = Some(Some(text));
+        } else if explained_hunk.iter().all(|elt| {
+            matches!(
+                elt,
+                DiffExplanationAtom::UnchangedConflictAdd(_)
+                    | DiffExplanationAtom::UnchangedConflictRemove(_)
+            )
+        }) {
+            // The conflict wasn't modified.
+            // TODO: Is there a better way to present the unmodified conflict in the
+            // context?
+            last_hunk_unmodified_text = Some(Some(
+                b"<<<<<<< Unmodified conflict (omitted) >>>>>>>".to_vec(),
+            ));
         } else if let [DiffExplanationAtom::ChangedConflictAdd {
             left_version,
             right_version,