mergetools / vimdiff2on commit interpret_branch_name: avoid @{upstream} past colon (3f6eb30)
   1. "$MERGE_TOOLS_DIR/vimdiff"