diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-06-10 22:23:34 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-06-10 22:23:34 +0200 |
| commit | dfb7bb1de198628b071ae78d59c0c63244a2a303 (patch) | |
| tree | 86ffee02d9868c63b4d4070c55664f5bd5281a15 /build/build_helper.php | |
| parent | 790f7ded5b285ca46fc99cbc375501351cdda988 (diff) | |
| parent | 0d349a82ca646cc2eebbfaf9a573ab1c8e32b6f6 (diff) | |
| download | forums-dfb7bb1de198628b071ae78d59c0c63244a2a303.tar forums-dfb7bb1de198628b071ae78d59c0c63244a2a303.tar.gz forums-dfb7bb1de198628b071ae78d59c0c63244a2a303.tar.bz2 forums-dfb7bb1de198628b071ae78d59c0c63244a2a303.tar.xz forums-dfb7bb1de198628b071ae78d59c0c63244a2a303.zip | |
Merge branch '3.0.x' into prep-release-3.1.5
Diffstat (limited to 'build/build_helper.php')
| -rw-r--r-- | build/build_helper.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build_helper.php b/build/build_helper.php index 35e8cd744b..3ff1b89eab 100644 --- a/build/build_helper.php +++ b/build/build_helper.php @@ -22,11 +22,11 @@ class build_package // -r - compare recursive // -N - Treat missing files as empty // -E - Ignore tab expansions - // not used: -b - Ignore space changes. - // -w - Ignore all whitespace + // -Z - Ignore white space at line end. + // -b - Ignore changes in the amount of white space. // -B - Ignore blank lines // -d - Try to find smaller set of changes - var $diff_options = '-crNEBwd'; + var $diff_options = '-crNEBZbd'; var $diff_options_long = '-x images -crNEB'; // -x fonts -x imageset //imageset not used here, because it includes the imageset.cfg file. ;) var $verbose = false; |