Barrett Ruth
09442f2e19
Problem: section diffs stripped combined diff entries entirely, so sections containing only unmerged files produced an empty result and showed "no changes in section". Solution: extract filenames from diff --cc entries before filtering, then generate proper unified diffs from :2: (ours) vs :3: (theirs) and append them to the filtered output. |
||
|---|---|---|
| .. | ||
| commands.lua | ||
| conflict.lua | ||
| debug.lua | ||
| diff.lua | ||
| fugitive.lua | ||
| git.lua | ||
| health.lua | ||
| highlight.lua | ||
| init.lua | ||
| lib.lua | ||
| log.lua | ||
| merge.lua | ||
| parser.lua | ||