Merge remote-tracking branch 'origin' into branch1
Merge remote-tracking branch 'origin' into branch1
Edit text2 in branch1.
Edit text2 in branch 1...
Merge from master. After restoring text2.
Merge pull request #6 from klab-ou-h/branch1

Branch1