Add 'Hello, GIT'
Add diff_1
Add diff_2
Merge branch 'diff'