add new file
message
=mes
=branch1
=branch2
=branch1
=branch1_commit
Merge branch 'br1'
=change br1.c
=change br1.c in ch2
=merge conflict
Тест utf-8 тест.. lksd
Merge remote-tracking branch 'origin/master'