diff options
author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 15:37:37 +0000 |
---|---|---|
committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 15:37:37 +0000 |
commit | 35863a08f69be12d36045e4aff3fb76945310d05 (patch) | |
tree | 81b3838921baed7a2e30e1e5a3aaf20a97da40b9 /solenv/bin/cleandiff.pl | |
parent | b37d03553dbe8540f49d43225045ad6312e6603b (diff) |
INTEGRATION: CWS ause090_DEV300 (1.2.978); FILE MERGED
2008/02/25 11:56:50 hjs 1.2.978.1: #i40959# make aware of unified patches
Diffstat (limited to 'solenv/bin/cleandiff.pl')
-rw-r--r-- | solenv/bin/cleandiff.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/solenv/bin/cleandiff.pl b/solenv/bin/cleandiff.pl index f8e8d1876f7d..b7ac4fce4b63 100644 --- a/solenv/bin/cleandiff.pl +++ b/solenv/bin/cleandiff.pl @@ -7,9 +7,9 @@ eval 'exec perl -wS $0 ${1+"$@"}' # # $RCSfile: cleandiff.pl,v $ # -# $Revision: 1.2 $ +# $Revision: 1.3 $ # -# last change: $Author: rt $ $Date: 2005-09-07 22:05:22 $ +# last change: $Author: kz $ $Date: 2008-03-05 16:37:37 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -40,6 +40,7 @@ while (<>) { next if /^Only in/ ; next if /^diff -rc / ; + next if /^diff -ru / ; next if /^Common sub/ ; if ( /^---/ || /^\*\*\*/ || /^\+\+\+/ ) |