Ignore:
Timestamp:
Sep 19, 2022, 8:11:02 PM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, ast-experimental, master, pthread-emulation
Children:
aa9f215
Parents:
ebf8ca5 (diff), ae1d151 (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 merge conflict

File:
1 moved

Legend:

Unmodified
Added
Removed
  • tests/meta/arch.cfa

    rebf8ca5 r23a08aa0  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // archVast.cfa -- Check if all combinations are of ast/arch are properly distinguished
     7// arch.cfa -- Check if all architectures are properly distinguished by the test suite
    88//
    99// Author           : Thierry Delisle
Note: See TracChangeset for help on using the changeset viewer.