Barrett Ruth
a20555667e
Problem: parse_file_line discarded the git status character (M, A, D, U, etc.), making it impossible to distinguish unmerged files from modified ones in the fugitive status buffer. Solution: capture and return the status character as a 3rd return value from parse_file_line, propagate it through get_file_at_line as a 5th return value, and pass unmerged=true to gdiff_file when status is 'U'. |
||
|---|---|---|
| .. | ||
| commands.lua | ||
| conflict.lua | ||
| debug.lua | ||
| diff.lua | ||
| fugitive.lua | ||
| git.lua | ||
| health.lua | ||
| highlight.lua | ||
| init.lua | ||
| lib.lua | ||
| log.lua | ||
| parser.lua | ||