Merge branch 'jk/utf-8-can-be-spelled-differently'
[git] / mergetools / gvimdiff
1 . "$MERGE_TOOLS_DIR/vimdiff"