mergetools / vimdiff2on commit Merge branch 'nd/apply-doc' into maint (f0acaa6)
   1. "$MERGE_TOOLS_DIR/vimdiff"