From 2228aa1abe57f900931b1ad9442d7cad910a8fbf Mon Sep 17 00:00:00 2001
From: mdb <mdb@users.savannah.nongnu.org>
Date: Wed, 5 Nov 2008 18:17:37 +0000
Subject: [PATCH] * sanity.sh (keyword-25): Fix merge from cvs 1.11.x problem.
---
src/ChangeLog | 2 ++
src/sanity.sh | 6 +-----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index f0f2733df..a61090b9b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
2008-11-05 Mark D. Baushke <mdb@gnu.org>
+ * sanity.sh (keyword-25): Fix merge from cvs 1.11.x problem.
+
*diff.c (diff): Use SEND_FORCE on files when a -k option is used
with diff to avoid client/server not finding the requested file.
* sanity.sh (keyword): Add tests for this.
diff --git a/src/sanity.sh b/src/sanity.sh
index 9478818e7..895fbe519 100755
--- a/src/sanity.sh
+++ b/src/sanity.sh
@@ -26541,11 +26541,7 @@ xx "'\$'"Log"'\$'
change"
dotest_fail keyword-25 "${testcvs} diff -kk file1" \
-"Index: file1
-===================================================================
-RCS file: ${CVSROOT_DIRNAME}/first-dir/file1,v
-retrieving revision 1\.3
-diff -r1\.3 file1
+"diff -r1\.3 file1
1c1
< \$Name\$
---
--
GitLab