mergetools / vimdiff3on commit Sync with 2.4.1 (1ea28e1)
   1. "$MERGE_TOOLS_DIR/vimdiff"