Re: Small Bug in TortoiseMerge

Lübbe Onken wrote:
> Hi Folks,
>
> A display bug in build 7351 - 32 Bit
>
> If the last line (block) in a file is conflicted, the "Use mine before
> theirs" or "Use theirs before mine" will operate correctly, which can be
> confirmed after the file has been saved.
>
> But you cannot scroll down to the lines that have been appended and see them
> (you only get to see the lines inserted "before"), which gives you the
> impression that the action has failed.

I can't reproduce this. I've tested using the Schiller's_Glocke_xxxx.txt
files in our sourcetree (test\mergediff). They also produce a conflict
at the last lines, and "use theirs before mine" works as expected.

Stefan

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