Re: Bug with merge/diff

Brannon King wrote:
> The following two examples don't merge correctly, in my opinion. The if
> statement on the bottom should take priority over the indentation of the
> braces.

Sorry, but that's not a bug.

* how should the diff algorithm know about programming languages?
* the diff algorithm is done by the Subversion library, not TSVN.

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