summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/changed-in-master.txt
blob: 11deab00b2d3a6f5a3073988ac050c2d7b6655e2 (plain)
1
changed in master