From: H.Merijn Brand <h.m.brand@xs4all.nl>
Date: Fri, 5 Sep 2003 11:18:20 +0000 (+0000)
Subject: Changed conflicting diff options
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=2c9b96449de2a0e181e68c6d6cbaeaeb71258cf7;p=p5sagit%2Fp5-mst-13.2.git

Changed conflicting diff options

p4raw-id: //depot/perl@21043
---

diff --git a/patchlevel.h b/patchlevel.h
index 139a9cc..64ffcb3 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -51,7 +51,7 @@
 	please place your applied patch line after its dependencies. This
 	will help tracking of patch dependencies.
 
-	Please either use 'diff -u --context=0' if your diff supports
+	Please either use 'diff --unified=0' if your diff supports
 	that or edit the hunk of the diff output which adds your patch
 	to this list, to remove context lines which would give patch
 	problems. For instance, if the original context diff is
@@ -73,6 +73,7 @@
 	   *** 41,43 ***
 	   --- 41,44 ---
 	   + 	,"MINE001 - my new patch"
+	     	,NULL
 	     };
 	
 	(Note changes to line numbers as well as removal of context lines.)