mergetools / gvimdiff2on commit Merge branch 'bc/commit-invalid-utf8' (73f4c9a)
   1. "$MERGE_TOOLS_DIR/vimdiff"