Barrett Ruth
93ee38db8c
Problem: git diff produces diff --cc (combined format) for unmerged files. This format uses @@@ triple-at headers and multi-column prefixes that the parser cannot handle, resulting in no highlighting when pressing du on a section header in a repo with merge conflicts. Solution: add filter_combined_diffs() to strip diff --cc entries from raw git diff output in both gdiff_section and read_buffer, leaving only standard unified diffs that the parser understands. |
||
|---|---|---|
| .. | ||
| 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 | ||