mergetools / gvimdiffon commit builtin/branch: stop supporting the "--set-upstream" option (5266884)
   1. "$MERGE_TOOLS_DIR/vimdiff"