mergetools / gvimdiff2on commit Honor core.precomposeUnicode in more places (8e712ef)
   1. "$MERGE_TOOLS_DIR/vimdiff"