Re: DiffBlamesWithTortoiseMerge

Alexander Klenin wrote:
> I noticed that CAppUtils::StartExtDiff function reads undocumented
> DiffBlamesWithTortoiseMerge registry flag.
> It's apparent effect is to disable external diff tools and always use
> TortoiseMerge instead.
> This, however, is not quite what the name implies, so I suspect this is a bug.
> To fix it, I need to know what this setting is intended to do ;-)
>
> Perhaps
> bool bUseTMerge = !!(DWORD)blamediff;
> should read
> bool bUseTMerge = bBlame && !!(DWORD)blamediff;
> ?

Yes, you're right.
Can you commit this please?

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