add test3 string
add test4 string
add test5 string
Merge branch 't1'
ad t1 string
Merge branch 't1'
added second t1 line
added t2 line before first t1 line
hz
added master and master2 lines
added t1 line after master
Changed master2 line (2 -> t2)
hz