OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 24-Sep-2007 21:44:05
Branch: HEAD Handle: 2007092420440500
Modified files:
openpkg-src/diffutils diffutils.patch
Log:
document -O option, too
Summary:
Revision Changes Path
1.3 +13 -0 openpkg-src/diffutils/diffutils.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/diffutils/diffutils.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 diffutils.patch
--- openpkg-src/diffutils/diffutils.patch 24 Sep 2007 19:30:50 -0000
1.2
+++ openpkg-src/diffutils/diffutils.patch 24 Sep 2007 19:44:05 -0000
1.3
@@ -24,6 +24,19 @@
on a 3-way merge without having to deal with the useless (already
"merged") information one would get under "diff3 -m -A". --rse 20070924
+Index: man/diff3.1
+--- man/diff3.1.orig 2004-04-13 09:07:28 +0200
++++ man/diff3.1 2007-09-24 21:42:43 +0200
+@@ -38,6 +38,9 @@
+ \fB\-a\fR \fB\-\-text\fR
+ Treat all files as text.
+ .TP
++\fB\-O\fR
++Always show content of OLDFILE in bracketing output of unmerged changes.
++.TP
+ \fB\-\-strip\-trailing\-cr\fR
+ Strip trailing carriage return on input.
+ .TP
Index: src/diff3.c
--- src/diff3.c.orig 2004-04-12 09:44:35 +0200
+++ src/diff3.c 2007-09-24 21:21:38 +0200
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
