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

Map dp in stage conflict to do the right thing

Browse Source
This commit is contained in:
Tim Pope
2011-04-25 11:50:19 -04:00
parent 3366704c8f
commit aebbbd335e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugin/fugitive.vim
View File

@@ -1124,10 +1124,13 @@ function! s:Diff(bang,...) abort
if exists(':DiffGitCached')
return 'DiffGitCached'
elseif (!a:0 || a:1 == ':') && s:buffer().commit() =~# '^[0-1]\=$' && s:repo().git_chomp_in_tree('ls-files', '--unmerged', '--', s:buffer().path()) !=# ''
let nr = bufnr('')
execute 'leftabove '.split.' `=fugitive#buffer().repo().translate(s:buffer().expand('':2''))`'
execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<CR>'
diffthis
wincmd p
execute 'rightbelow '.split.' `=fugitive#buffer().repo().translate(s:buffer().expand('':3''))`'
execute 'nnoremap dp <buffer> <silent> :diffput '.nr.'<CR>'
diffthis
wincmd p
diffthis