From 832f7c62261930517453fec96d78f79d5289b75d Mon Sep 17 00:00:00 2001
From: Georgi Kirilov <>
Date: Mon, 30 Aug 2021 12:59:41 +0300
Subject: [PATCH] fix quickfix for combined diffs

The --cc option is issued for merge conflicts.
---
 autoload/gitgutter.vim | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/autoload/gitgutter.vim b/autoload/gitgutter.vim
index 0daa906..4ccc141 100644
--- 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