X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/5c2d2dd042f91ba1864a767fb3209f06b8a08a5b..148295024c93e47f90ac850bf068e592b16b1c7c:/git/config

diff --git a/git/config b/git/config
index 06d2603..911ad2c 100644
--- a/git/config
+++ b/git/config
@@ -23,5 +23,6 @@
 	cmd = vim -f -c \"Gvdiff\" \"$MERGED\"
 [merge]
 	tool = fugitive
+	defaultToUpstream = true
 [mergetool]
 	prompt = no