From 72ba15a3939fa1840f3ef901d56cfc6ccb5fd20b Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 14 May 2015 18:04:32 +0200
Subject: git: add vim mergetool

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .gitconfig | 2 ++
 1 file changed, 2 insertions(+)

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index b998f0d..c09375a 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -36,6 +36,8 @@
 	#cccmd = git-cc
 [mergetool "cp"]
 	cmd = cp \"$REMOTE\" \"$MERGED\"
+[mergetool "vim"]
+	cmd = vim -f \"$MERGED\"
 [mergetool "vimdiff3"]
 	cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
 [core]
-- 
cgit v1.2.3-24-g4f1b