diff options
| author | H.Merijn Brand <h.m.brand@xs4all.nl> | 2003-09-05 11:18:20 +0000 |
|---|---|---|
| committer | H.Merijn Brand <h.m.brand@xs4all.nl> | 2003-09-05 11:18:20 +0000 |
| commit | 2c9b96449de2a0e181e68c6d6cbaeaeb71258cf7 (patch) | |
| tree | 11c9987aae394f4331a7c34055c026472ba5a785 /patchlevel.h | |
| parent | 029149a3a15c2ba446182d3da9b94b640c047cac (diff) | |
| download | perl-2c9b96449de2a0e181e68c6d6cbaeaeb71258cf7.tar.gz | |
Changed conflicting diff options
p4raw-id: //depot/perl@21043
Diffstat (limited to 'patchlevel.h')
| -rw-r--r-- | patchlevel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/patchlevel.h b/patchlevel.h index 139a9ccf21..64ffcb3b83 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.) |