mercurial & binary files

[Matt Mackall]

On Mon, 2008-07-28 at 18:30 +0200, Marko Käning wrote:
> > You might want to configure merge-patterns in your .ini:
> 
> Well, did I get this right:
> 
> If I set a merge pattern to interal:fail mercurial won't use a merge tool 
> to update or commit a new version, but instead just overwrite the existing 
> data with the new one.
> 
> Correct?

No, it will fail just like it says! Your choices are:

internal:merge - try to do a normal three-way if files appear to be text
internal:fail - fail
internal:local - preserve the local copy
internal:other - take the remote copy, losing any local changes

You probably want fail, as it will give you a chance to decide what to
do.

-- 
Mathematics is the supreme nostalgia of our time.