Change: renamed file
ADD: file2
new file3
modified file3
add file4
file4 erste Änderung
file4 zweite Änderung
Commit old version
HotFix security hole
add file5
Feature
add file6 for feature
Changes for feature
changes on master
Merge branch 'master' into new-feature