m-vim_plugins/vim-fugitive
1
0
Fork 0
mirror of https://github.com/tpope/vim-fugitive.git synced 2025-11-14 22:33:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Match "* Unmerged path" in mergetool

Browse Source 
This happens in leiu of a diff when one of the commits adds (or
presumably removes) the file rather than changing it.
This commit is contained in:
Tim Pope
2020-01-12 18:53:21 -05:00
parent 6bc345f6f1
commit 6a638f2392
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/fugitive.vim
View File

@@ -3861,6 +3861,9 @@ function! s:ToolParse(state, line) abort
let offsets = split(matchstr(a:line, '^@\+ \zs[-+0-9, ]\+\ze @'), ' ') 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.*')) return s:ToolItems(a:state, a:state.from, a:state.to, offsets, matchstr(a:line, ' @@\+ \zs.*'))
endif 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.' elseif a:line =~# '^[A-Z]\d*\t.\|^:.*\t.'
" --raw, --name-status " --raw, --name-status
let [status; files] = split(a:line, "\t") let [status; files] = split(a:line, "\t")