2 files changed, 11 insertions, 0 deletions
diff --git a/vim/bundle/diff_prune b/vim/bundle/diff_prune
new file mode 160000
+Subproject 7b1356734b2262c46ffc401f2c89f183509ff77
diff --git a/vim/vimrc b/vim/vimrc
index ab4e971d..5eadb86a 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -272,6 +272,17 @@ nmap \x <Plug>StripTrailingWhitespace
 " \z sets NZ English spelling (compare \u)
 nnoremap \z :<C-U>setlocal spelllang=en_nz spelllang?<CR>
 
+" Key bindings for diff mode
+if has('autocmd') && v:version >= 700
+  augroup vimrc
+      autocmd!
+      autocmd FileType diff
+            \ nmap <buffer> <LocalLeader>p <Plug>DiffPrune
+      autocmd FileType diff
+            \ xmap <buffer> <LocalLeader>p <Plug>DiffPrune
+  augroup END
+endif
+
 " Add packaged matchit.vim, if supported
 if has('packages')
   packadd! matchit