mergetools / vimdiff3on commit branch: do not call a "remote-tracking branch" a "remote branch" (ccd593c)
   1. "$MERGE_TOOLS_DIR/vimdiff"