mergetools / vimdiff2on commit Merge branch 'jc/abbrev-autoscale-config' into maint (46ab222)
   1. "$MERGE_TOOLS_DIR/vimdiff"