Ignore:
Timestamp:
Aug 31, 2023, 11:31:15 PM (3 years ago)
Author:
JiadaL <j82liang@…>
Branches:
master, stuck-waitfor-destruct
Children:
950c58e
Parents:
92355883 (diff), 686912c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Resolve conflict

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tests/.expect/alloc.txt

    r92355883 r2a301ff  
    66
    77C   array calloc, fill 0
    8 0 0 0 0 0 0 0 0 0 0
     80x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0
    99CFA array calloc, fill 0
    10 0 0 0 0 0 0 0 0 0 0
     100x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0x0
    1111CFA array alloc, no fill
    12120xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef 0xdeadbeef
Note: See TracChangeset for help on using the changeset viewer.