Merge branch 'dn/test-reject-utf-16'
[git] / mergetools / vimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"