Re: TortoiseMerge

Doucette, Charles wrote:
> May I make one small request for TortoiseMerge.
> It is hard to see the compare the two conflicting lines side to side.
> It would be nice to reserve two lines in the display (perhaps in the
> middle) to show the two conflicting lines over each other.

A conflict can't happen with only two lines. It always requires three
lines. And that's the problem: how to show those three lines so the user
can see which of the three lines corresponds to which file.

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