Changeset 1da7397 for tests


Ignore:
Timestamp:
Mar 27, 2021, 6:04:14 PM (7 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
fec3e9a
Parents:
2644610 (diff), f8a7fed (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:

fix conflict

Location:
tests
Files:
6 added
1 edited

Legend:

Unmodified
Added
Removed
  • tests/Makefile.am

    r2644610 r1da7397  
    7575        pybin/tools.py \
    7676        long_tests.hfa \
    77         .in/io.data \
    7877        io/.in/io.data \
     78        io/.in/many_read.data \
    7979        avltree/avl.h \
    8080        avltree/avl-private.h \
    8181        concurrent/clib.c \
     82        concurrent/clib_tls.c \
    8283        exceptions/with-threads.hfa \
    8384        exceptions/except-io.hfa
Note: See TracChangeset for help on using the changeset viewer.