mergetools / gvimdiff2on commit Merge branch 'jk/utf-8-can-be-spelled-differently' (31b12a1)
   1. "$MERGE_TOOLS_DIR/vimdiff"