mergetools / vimdiff3on commit Merge branch 'et/add-chmod-x' into maint (bf3a55a)
   1. "$MERGE_TOOLS_DIR/vimdiff"