mergetools / gvimdiff3on commit Merge branch 'es/blame-commit-info-fix' (073bb8e)
   1. "$MERGE_TOOLS_DIR/vimdiff"