1 files changed, 2 insertions, 0 deletions
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]