summaryrefslogtreecommitdiffstats
path: root/tests/t-file-conflicts/pkg-a/test-conflict
blob: e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 (plain)