Skip to main content

Module combined_diff_patch

Module combined_diff_patch 

Source
Expand description

Git-style combined merge diff hunks (diff --cc / diff --combined).

This approximates Git’s combine-diff.c behaviour: per-parent Myers diffs against the merge result, lost-line lists with LCS coalescing, dense (--cc) hunk suppression, and @@@ headers.

Structs§

CombinedDiffWsOptions
Whitespace handling for combined diffs (Git xdl_opts subset).

Functions§

format_combined_diff_body
Combined diff body: @@@ hunks and parent/result lines (no diff --cc header).