[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

TortoiseMerge

From: Graham Bloice <graham.bloice_at_trihedral.com>
Date: 2006-02-01 16:04:23 CET

When viewing a diff the diff highlighter widget at the bottom of the
window behaves a little unintuitively.

The original line was:

" else if (pbv->getValid()) {"

The modified line was:

" else if (pbv != NULL && pbv->getValid()) {"

The highlighter widget had the following portion of both lines in light
green:

"pbv->getValid()) {"

and the following portion in the modified line in yellow:

" != NULL && "

So the actual change was the addition of the "pbv != NULL &&", but the
yellow highlight implied that the additional pbv wan't part of the change.

Please CC me on any replies.

Regards,

Graham Bloice

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Feb 1 17:13:18 2006

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.