fix quickfix for combined diffs

The --cc option is issued for merge conflicts.
devoc09 · Aug 30, 2021 · 832f7c6 · 832f7c6
1 parent 549fb96
commit 832f7c6
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/autoload/gitgutter.vim b/autoload/gitgutter.vim
@@ -205,6 +205,10 @@ function! gitgutter#quickfix(current_file)
     elseif line =~ '^diff --git "'
       let [_, fnamel, _, fnamer] = split(line, '"')
       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 =~ '^@@'
       let lnum = matchlist(line, '+\(\d\+\)')[1]
     elseif lnum > 0