So, I'm trying to achieve behaviour when git forces me to manualy resolve
any conflicts, even if there is one more character added in newer version.
Merge branch 'v2'

Conflicts:
	README.md

Seems like -s "resolve" is what I'm looking for - it forces handling of
any changes by hand.