1st
10
11
12
13
14
master1
Merge remote-tracking branch 'origin/master'
commit on master1
commit on master2
commit on master3
commit on master4
file1 c1
file3 c1
Change in master
Change on file1
Some change in file2

More text.
Changes on file3
Revert "Some change in file2"

This reverts commit 10d2dbec187b86a6a5931c7ef5a90b8ace34d47c.
Merge branch 'new-feature'