Re: Confused by Tortoise Merge Dialog for Simple Example

On 28.10.2014 10:03, Alexandre Guillemé wrote:
> Maybe you didn'y have end of line after "Change 1"
> so when you added "Change 2", you also added a "CR/LF" after Change 1,
> so the line is different

Or: no EOL at the end of the last line.
TortoiseSVN is using the diffing engine of the svn library. And that lib
does the diff using blocks of lines. So if the last line does not have
an EOL, it is not considered a complete line and therefore treated as
part of the previous block.

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=3090548
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].