Locking (binary) files which can't be merged

[Jens.Wulf at sew-eurodrive.de]

Hello again,

how does mercurial deal with binary files which can't be merged and are 
usually locked (when using a centralized SCM) before editing them?

I wonder if this is the wrong place to ask questions like that -- there has 
been no reply to my question about forest/externals...why? What is 
your suggestion about how one should learn about things like that?

Best regards,
Jens



SEW-EURODRIVE GmbH & Co KG
Kommanditgesellschaft, Sitz: Bruchsal, RG Mannheim HRA 230970
Komplementärin: SEW-EURODRIVE Verwaltungs-GmbH, Sitz: Bruchsal, RG Mannheim HRB 230207

Gesellschafter und Geschäftsführer: Rainer Blickle, Jürgen Blickle
Geschäftsführer: Hans Sondermann, Bernd P. Uckrow