mergetools / vimdiff2on commit Merge branch 'mk/mingw-winansi-ttyname-termination-fix' into maint (8554ee1)
   1. "$MERGE_TOOLS_DIR/vimdiff"