Wow, thanks, that's really good to know and quite different from what I expected. I guess thinking of MERGE as a single atomic DML operation is a red herring.

I should have mentioned that the code in question is executing in an explicit transaction block. Had it not, neither version would have prevented the deadlock situation, since the TABLOCKX...