motiejus/dotfiles

commit b11669a2eb09b98c11d191e5fbd9df7eb18bdb25 (tree)
parent aebbbd335eeb2f753b1650180bd31349c4208209
Author: Tim Pope <code@tpope.net>
Date:   Mon, 25 Apr 2011 14:31:59 -0400

Perform automatic :diffupdate after conflict dp

Diffstat:
M
plugin/fugitive.vim
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
@@ -1126,11 +1126,11 @@ function! s:Diff(bang,...) abort
   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>'
+    execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>'
     diffthis
     wincmd p
     execute 'rightbelow '.split.' `=fugitive#buffer().repo().translate(s:buffer().expand('':3''))`'
-    execute 'nnoremap dp <buffer> <silent> :diffput '.nr.'<CR>'
+    execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>'
     diffthis
     wincmd p
     diffthis