Subversion merge conflicts (part 2)
From: Gleason, Todd <tgleason_at_impac.com>
Date: Mon, 30 Jun 2008 10:28:09 -0700
I see that the main question on the "SVN Merge Conflicts Issue" thread
Looking at http://subversion.tigris.org/svn_1.4_releasenotes.html I see:
svn diff -x [-u | -b | -w | --ignore-eol-style]
You can make the internal svn diff ignore whitespace, according to this.
And whose whitespace is used when you ignore whitespace? Is it a
Or do you need to mandate tabs or spaces for everything to work
This is an archived mail posted to the TortoiseSVN Users mailing list.