feature2.txt
Merge branch 'master' into feature
masterfeature3.txt