added file for feature1
added file for feature2
added some text
added some text
Merge branch 'feature1'
with --no-ff
Merge branch 'feature2'
with --no-ff