Re: 'Theirs' merge between branches on a binary file.

"Tim Visher" [off-list ref] writes:

I have a binary file that is coming up with a merge conflict
(obviously) between two branches and I want to simply say, 'take their
version of the file'.

Do you mean during a conflicted merge resolution you would want to check
their version out of the index and declare that it is the merge result?