From: Joachim E. <joa...@gm...> - 2005-12-08 18:10:00
|
Hi Andris, You probably want to select all places with only whitespace differences from one source. In the Merge-menu there are commands to select all unsolved whitespace conflicts from A, B or C. The whitespace autoselection in the config-dialog works only for the next merge you start. Cheers, Joachim Am Donnerstag, 8. Dezember 2005 10:48 schrieb Andris Skattebo: > Hi, > > How do I make kdiff3 ignore whitespace differences? This is a problem > for me especially when I want to merge files where one branch has > removed all "trailing spaces" (e.g. due to settings in TextPad) at end > of line, while the other branch hasn't. I see one option regarding white > space under Configure - Directory Merge, but that doesn't seem to work > properly. > > Regards > Andris > > Andris Skattebo > Principal Consultant > Scandpower Petroleum Technology AS > P.O.Box 3 > N-2027 Kjeller, Norway > > E-mail address: And...@sc... > > Phone: Direct +47 64844574 > Mobile +47 97127384 > > Switchboard: +47 64844400 > Telefax: +47 64844595 > > http://www.scandpowerpt.com <http://www.scandpowerpt.com/> > http://www.olga2000.com <http://www.olga2000.com/> |