mergetools / gvimdiff2on commit Merge branch 'jk/diff-blob' into maint (16ba0f4)
   1. "$MERGE_TOOLS_DIR/vimdiff"