mergetools / vimdiff2on commit Merge branch 'jc/hash-object' into maint (1e6c8ba)
   1. "$MERGE_TOOLS_DIR/vimdiff"