X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/fb657354cd3a63f8415f7ee4716903c18c5ed549..697fa213c6d05127c095586717383c26492e0693:/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