mergetools / vimdiff2on commit Merge branch 'km/config-grammofix' into maint (67476f5)
   1. "$MERGE_TOOLS_DIR/vimdiff"