mergetools / gvimdiff3on commit Merge branch 'jk/utf8-switch-between-nfd-and-nfc' (1265886)
   1. "$MERGE_TOOLS_DIR/vimdiff"