mergetools / vimdiff2on commit Merge branch 'mg/more-textconv' (4197361)
   1. "$MERGE_TOOLS_DIR/vimdiff"