summaryrefslogtreecommitdiff
path: root/tests/format/junctions/conflicts
Commit message (Expand)AuthorAgeFilesLines
* tests/format/junctions.py: Adding tests for the overrides featureTristan van Berkom2020-06-2331-0/+133