Re: TortoiseMerge: Use left file except marked blocks....

On 13.03.2014 16:14, ch3cooli wrote:
> Should CBaseView::UseViewBlock() to skip unmarked blocks or unedited blocks?

It should skip everything *but* unmarked blocks.

When you do a "Leave only marked changes" it should make the right view
so that it does what you intended to do, but also leave all edited lines
instead of overwriting those with the left lines.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3074539
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].