Re: use "their" block in TortoiseMerge

Stephen Dewey wrote:
> Ok... well I looked at a few more files and it seems that I do get the
> menus in the bottom pane ONLY when they are bright red signifying an
> inline conflict. In other cases, there are some lines that are light
> red (signifying deletion) and other lines that are light green
> (signifying addition) and I only get the options in the upper right
> pane. I can't get options in the upper left or bottom pane in those
> cases, even if I highlight. Maybe that is intentional? Also, in these
> cases, the lower right-hand corner states "conflicts: 0". So I wonder
> why it got marked as conflicted in the first place, because it started
> out with 0 conflicts.

If Subversion marked the file as in conflict, but TortoiseMerge shows
you 0 conflicts, then you have set TortoiseMerge to ignore some changes,
most likely line endings and/or whitespace changes.
In that case, TortoiseMerge doesn't show you a conflict, but for
Subversion (and TortoiseSVN) the conflict still exists.

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