Re: display problem with TortoiseMerge

On 22.06.2012 13:39, Stefan Wild wrote:
>> Changed this so that the three files compared are:
>> BASE : the file before the update
>> THEIRS: the file in HEAD
>> MINE : the local file, probably with local modifications
>>
>> You can try a nightly build >= r23020
>>
>> Stefan
>>
>
> thanks! I tried it, merge (green) now looks fine, but updated files
> still compare with last revision, not my wc. (I see the changes I
> just got AND the last changes I committed)

Have a look at the picture in the docs here:
http://tortoisesvn.net/docs/release/TortoiseMerge_en/tmerge-basics-conflicts.html

What you see in the left and right view are the diffs between "theirs"
and "base" (left) and "yours" and "base" (right).

The view at the bottom shows then the result, i.e. your local file "yours".

What files would you use to show here instead?

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2973156
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].