about summary refs log tree commit diff
path: root/src/test/ui/parser/diff-markers
AgeCommit message (Collapse)AuthorLines
2023-01-11Move /src/test to /testsAlbert Larsan-318/+0
2022-12-28Add support for diff3 formatEsteban Küber-2/+7
2022-12-28Tweak wordingEsteban Küber-33/+77
2022-12-28Account for ADT bodies and struct expressionsEsteban Küber-0/+112
2022-12-28Detect diff markers in the parserEsteban Küber-0/+157
Partly address #32059.