mergetools / vimdiff2on commit Merge branch 'jk/blame-fixes' into maint (5fbb42a)
   1. "$MERGE_TOOLS_DIR/vimdiff"