mergetools / vimdiff2on commit rebase: prepare to do generic housekeeping (f5f758a)
   1. "$MERGE_TOOLS_DIR/vimdiff"