m-vim_plugins/vim-gitgutter
1
0
Fork 0
mirror of https://github.com/airblade/vim-gitgutter.git synced 2025-11-08 11:33:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix quickfix for combined diffs

Browse Source 
The --cc option is issued for merge conflicts.
This commit is contained in:
Georgi Kirilov
2021-08-30 12:59:41 +03:00
parent 549fb96d58
commit 832f7c6226
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
autoload/gitgutter.vim
View File

@@ -205,6 +205,10 @@ function! gitgutter#quickfix(current_file)
elseif line =~ '^diff --git "' elseif line =~ '^diff --git "'
let [_, fnamel, _, fnamer] = split(line, '"') let [_, fnamel, _, fnamer] = split(line, '"')
let fname = fnamel ==# fnamer ? fnamel : fnamel[2:] let fname = fnamel ==# fnamer ? fnamel : fnamel[2:]
elseif line =~ '^diff --cc [^"]'
let fname = line[10:]
elseif line =~ '^diff --cc "'
let [_, fname] = split(line, '"')
elseif line =~ '^@@' elseif line =~ '^@@'
let lnum = matchlist(line, '+\(\d\+\)')[1] let lnum = matchlist(line, '+\(\d\+\)')[1]
elseif lnum > 0 elseif lnum > 0