работает!
Merge branch 'TestBranch'

Conflicts:
	SystemDyf/В¦В¬В¦В¬В¦-В¦- - РєРѕРїРёСЏ.txt
1
1
Merge branch 'master' into TestBranch
1