From 6a638f23929cae5cbe43359ff192dc055c2de852 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Sun, 12 Jan 2020 18:53:21 -0500
Subject: [PATCH] Match "* Unmerged path" in mergetool

This happens in leiu of a diff when one of the commits adds (or
presumably removes) the file rather than changing it.
---
 autoload/fugitive.vim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/autoload/fugitive.vim b/autoload/fugitive.vim
index 232e1cf..41bbd15 100644
--- a/autoload/fugitive.vim
+++ b/autoload/fugitive.vim
@@ -3861,6 +3861,9 @@ function! s:ToolParse(state, line) abort
       let offsets = split(matchstr(a:line, '^@\+ \zs[-+0-9, ]\+\ze @'), ' ')
       return s:ToolItems(a:state, a:state.from, a:state.to, offsets, matchstr(a:line, ' @@\+ \zs.*'))
     endif
+  elseif a:line =~# '^\* Unmerged path .'
+    let file = a:line[16:-1]
+    return s:ToolItems(a:state, file, file, [], '')
   elseif a:line =~# '^[A-Z]\d*\t.\|^:.*\t.'
     " --raw, --name-status
     let [status; files] = split(a:line, "\t")