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

RE: TortoiseMerge Tool request

From: <webpost_at_tigris.org>
Date: Tue, 28 Apr 2009 06:04:05 -0700 (PDT)

I would love a tool that compares wordwise and ignores single line breaks but not double ones.

LaTeX normally does not make a difference between a single line break and a white space, but the text editors keep breaking and appending lines over and over.

Is there ever such a tool?

More precisely,

It would perfect that the tool compares Mine and Yours, having Old as the reference, treating triple or quadruple line breaks as double line breaks, single line breaks as spaces and then show to me just the real conflicts (words, sentences or paragraphs where both Mine and Yours differ from Old).

In the merged version, it should allow the user to decide if it would borrow the formatation (spaces and line breaks) from Mine, Yours, or Old.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-28 15:17:18 CEST

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