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§
- Combined
Diff WsOptions - Whitespace handling for combined diffs (Git
xdl_optssubset).
Functions§
- format_
combined_ diff_ body - Combined diff body:
@@@hunks and parent/result lines (nodiff --ccheader).