use "their" block in TortoiseMerge

I have looked through the FAQ's, help files, and other resources, but
can't seem to find an answer to this question... I apologize if I am
missing something obvious.

I have a conflicted file that needs to be merged. So I right click on
it and click "Edit conflicts." I get the TortoiseMerge tool, and see
the conflicts. I have 3 panes - "theirs" in the upper left, "mine" in
the upper right, and "merged" at the bottom.

Now, according to the help file, I should only be able to edit the
bottom pane, and I should get options for using "their" block only,
"my" block only, "theirs" before mine, and vice-versa.

However, what actually happens is that I can only edit the upper-right
pane, and I don't get any option to use "their" block. I only have
options to use my block, use my whole file, or use theirs before mine,
or mine before theirs.

I want to "Use text block from 'theirs'" - is there no way to do that?

Thanks a bunch for your help, and for making such a great program!

Stephen

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Nov 15 23:39:08 2007