Re: diff handles addition on line end funny sometimes
From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 18 May 2009 18:18:24 +0200
David Balažic wrote:
The code is trivial, yes. But first define what "added at the line end"
What about
> 2.) Your example is different, because you removed the last word on the line.
Define "word" please :)
this.
is "this" the word? Or "this."? If "this", then is "." a word itself?
TMerge doesn't know about words but only tokens. It doesn't understand
> Even so, I see no harm in coloring the new part as "new part" and the rest as
There's an option in TMerge:
try toggling that option - it toggles the definition of 'word'.
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=2301314 To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
|
This is an archived mail posted to the TortoiseSVN Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.