Re: Right-click not working in tortoisemerge

Tankko wrote:
> 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.

First left-click on a line. Then right-click.
Or:
* make sure nothing is selected (maybe left-click on already selected lines)
* right-click on a modified/added/removed block

> 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.

That usually means that only the line endings are different (TMerge will
ignore line endings if you don't change the setting).

If you use your files on two different OS, then you have to set the
svn:eol-style property on your text files. Otherwise you *will* get into
troubles.

Also keep in mind that TortoiseMerge in version 1.4.5 still has problems
with files that have MAC line endings (CR only). This works now in the
latest nightly build, but not in the latest official release.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org