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

Merge always thinks first and last lines are different?

From: Cory Riddell <cory_at_codeware.com>
Date: Mon, 29 Mar 2010 11:58:58 -0500

I've set TortoiseMerge to be my diff tool in SourceSafe. When I select
two file versions to diff, TortoiseMerge seems to always think the first
and last lines of the file differ. Or rather it behaves as if the lines
differ.

For example, say I have two version of a file that differ in only one
spot. When I load the versions into TortoiseMerge, it initially will
place the cursor on the difference and highlight with the appropriate
color. However, if I press ctrl-up (previous difference) or ctrl-down
(next difference), it will jump to and select with an open box the first
or last line of the file. This is surprising because those lines do not
differ.

Am I just not understanding the TortoiseMerge philosophy? FWIW, I am
ignoring all whitespaces.

Cory

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2466755

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-29 19:14:45 CEST

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