mergetools / gvimdiff2on commit push: also use "upstream" mapping when pushing a single ref (fc9261c)
   1. "$MERGE_TOOLS_DIR/vimdiff"