[Monotone-devel] Re: line endings with 0.31

[Bruce Stephens]

Brian May <address@hidden> writes:

>>>>>> "Bruce" == Bruce Stephens <address@hidden> writes:
>
>     Bruce> Sure, that may happen.  That's just a bug, though, isn't
>     Bruce> it, so you commit a revision containing the changes to that
>     Bruce> one file (including attribute change) as a child of the
>     Bruce> original, and merge it wherever necessary?
>
> Out of curiosity, what happens in Monotone if you try to merge two
> changed versions of a binary file?

I think the normal lua hook is called.  Presuming that that fails, the
merge fails.