mergetools / vimdiff2on commit Merge branch 'jk/utf-8-can-be-spelled-differently' into maint (d7cccbb)
   1. "$MERGE_TOOLS_DIR/vimdiff"