From: Joachim E. <joa...@gm...> - 2009-05-03 07:26:16
|
Hi Neal, During line matching phase white space is always ignored. You can't disable that. But in the view whitespace is highlighted. This can be disabled. During the merge whitespace changes also cause conflicts which have to be solved. But there is a menu option that allows to solve all pure whitespace conflicts in favor of A/B or C. Does this help? Joachim Am Freitag 01 Mai 2009 14:43:46 schrieb Neal Becker: > No switch to ignore whitespace diffs? I could use that. > > --------------------------------------------------------------------------- >--- Register Now & Save for Velocity, the Web Performance & Operations > Conference from O'Reilly Media. Velocity features a full day of > expert-led, hands-on workshops and two days of sessions from industry > leaders in dedicated Performance & Operations tracks. Use code vel09scf > and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf > _______________________________________________ > Kdiff3-user mailing list > Kdi...@li... > https://lists.sourceforge.net/lists/listinfo/kdiff3-user |