mergetools / vimdiff2on commit Merge branch 'nd/strbuf-inline-styles' (27c2c2e)
   1. "$MERGE_TOOLS_DIR/vimdiff"