From 299284c149b14ced932d29deaa9b5c3b5b6136d8 Mon Sep 17 00:00:00 2001
From: Kolan Sh <mecareful@gmail.com>
Date: Wed, 10 Apr 2013 14:30:36 +0400
Subject: [PATCH] VimDiff: do/dp shortcuts for 3-way diffs.

---
 .vimrc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.vimrc b/.vimrc
index cb86c66..d7cb5b9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -216,3 +216,14 @@ let g:tagbar_ctags_bin = "anjuta-tags"
 
 " ----- NERDTree ------
 nmap <F12> :NERDTreeToggle<CR> 
+
+" ------- VimDiff -------
+if &diff
+  let mapleader = ","
+  map dp1 :diffput LOCAL<CR>
+  map dp2 :diffput BASE<CR>
+  map dp3 :diffput REMOTE<CR>
+  map do1 :diffget LOCAL<CR>
+  map do2 :diffget BASE<CR>
+  map do3 :diffget REMOTE<CR>
+endif