FW: FW: mercuria destroys everyone's work

[Pierre-Yves David]

On 02/04/2016 10:12 AM, FLORENT Philippe wrote:
> Now we just found that even with an non automatic merge, complete manual override
> We select the b version for a line, and save/commit
>
> I check the code and here it is : the fucking c version of that very line
>
> Now I got to fucking tell the customer why that piece of shit is not taking the correct line
>
> Let me guess I am stupid, and kdiff is perfect, right ??
> Jesus f.. Christ

The tone of your email is way past something acceptable for a public 
mailing list. Please go back to an appropriate tone or we'll have to 
take action.

This is public mailing list for user of Mercurial to exchange around 
idea and issue. A fair amount of the reply you have received where high 
quality and full of good will. Please respect other people on this list 
and let them help you.

You seems to have trouble with your merge tool. Merge tools are actually 
unrelated to the Mercurial project, we just rely on existing solution to 
help user performing there merge. I'm not sure what is going wrong here 
as we did not got many report of issue with kdiff. Maybe you could 
describe your setup and process so that people can help you spot what is 
going wrong.

Cheers,

-- 
Pierre-Yves David