do not confuse people with this additional option which is provided by OpenPKG only

diffutils/diffutils.patch

@@ -32,7 +32,7 @@ Index: man/diff3.1
  Treat all files as text.
  .TP
 +\fB\-O\fR
-+Always show content of OLDFILE in bracketing output of unmerged changes.
++Always show content of OLDFILE in bracketing output of unmerged changes. (OpenPKG only)
 +.TP
  \fB\-\-strip\-trailing\-cr\fR
  Strip trailing carriage return on input.

diffutils/diffutils.spec

@@ -33,7 +33,7 @@ Class:        BASE
 Group:        Patching
 License:      GPL
 Version:      2.8.7
-Release:      20070924
+Release:      20071005
 
 #   list of sources
 Source0:      ftp://alpha.gnu.org/gnu/diffutils/diffutils-%{version}.tar.gz