X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/5c2d2dd042f91ba1864a767fb3209f06b8a08a5b..54e21bc059c009ba4e28e980b851c4560606ba47:/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