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.