Right-click not working in tortoisemerge

I'm running tortoisemerge (via the Edit conflicts menu) and I can't
seem to right click on any of the difference. No context menu ever
shows up as the docs say it should.

Also, I am editing these files on the Mac and Windows. I don't know
if line endings are messing something up. When I open on the .cpp
file that has the conflict icon on it, the whole file is one big
difference, yet tortoisemerge seems to show all correct lines as
having the changes.

This is my first time merging files edited on those two platforms, so
maybe I'm doing something wrong. If I look at the the foo.cpp.r357
that came from the Mac, it's line endings are not in DOS format. How
do people typically deal with the line ending issues with going from
Windows to Mac/Unix?

I am running on Vista, using tortoisemerge 1.4.5 - build 10425

Tankko

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Fri Nov 9 19:14:09 2007