summaryrefslogtreecommitdiffstats
path: root/tests/resources/merge-resolve/added-in-master.txt
blob: 233c0919c998ed110a4b6ff36f353aec8b713487 (plain)
1
this file is added in master