deferred merge

Is there some easy oe-time way of asking a merge to be deferred, so 
that the "merged" file has both versions in it, complete with 
'<<<<<<<<' and ">>>>>>>" and ssuch to mark the conflicts?  Because 
sometimes it takes a lot more analysis than is practical with the emacs 
merge command.

-- hendrik