mergetools / vimdiff2on commit Merge branch 'dn/test-reject-utf-16' (d6f3ab5)
   1. "$MERGE_TOOLS_DIR/vimdiff"