Merge branch 'jk/utf8-switch-between-nfd-and-nfc'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"