mergetools / vimdiff3on commit Merge branch 'ee/clean-test-fixes' into maint (fb8880d)
   1. "$MERGE_TOOLS_DIR/vimdiff"