mergetools / gvimdiff2on commit branch doc: remove --set-upstream from synopsis (a060f3d)
   1. "$MERGE_TOOLS_DIR/vimdiff"