mergetools / vimdiff2on commit Merge branch 'nd/config-misc-fixes' into maint (bb7c47a)
   1. "$MERGE_TOOLS_DIR/vimdiff"