User-specific "do-not-merge" for certain file types?

Hello,

A colleague of mine wants to prevent merge-on-update for assembler files
(.a66). Let's call him Joe.

Others like the merge functionality, so I can't simply configure the
TortoiseSVN installations to use an auto-prop setting the mime type of
assempler file to application/octet-stream.

Is there at way to configure Joe's TortoiseSVN to never merge .a66 files
on update. I.e. always conflict .a66 files if both the repository and the
working copy have been altered since last update/checkout?

-- 
Greetings from Troels Arvin
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org