Am still dazed and confused... > > Mercurial gets it right almost always automatically. How can I make sure, that Mercurial gets it 100% right? Is there a way to tell hg that a certain file has to be treated as an unmergable binary?