mergetools / vimdiff2on commit Sync with 'maint' (2a4a26b)
   1. "$MERGE_TOOLS_DIR/vimdiff"