mergetools / vimdiff3on commit Merge branch 'mk/blame-error-message' into maint (fdca2be)
   1. "$MERGE_TOOLS_DIR/vimdiff"