mergetools / vimdiff3on commit Prepare for 2.21 cycle to start soonish (85c26ae)
   1. "$MERGE_TOOLS_DIR/vimdiff"