diff --git a/git/.gitconfig b/git/.gitconfig
index 1d59f75..f42f207 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -40,6 +40,13 @@
 [diff]
     algorithm = patience
 
+[merge]
+    tool = fugitive
+
+[mergetool "fugitive"]
+    cmd = vim -f -c \"Gdiff!\" \"$MERGED\"
+    trustExitCode = true
+
 [pager]
     diff = /usr/share/git/diff-highlight/diff-highlight | less
     log = /usr/share/git/diff-highlight/diff-highlight | less