diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-03-15 12:07:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-15 12:07:15 -0400 |
| commit | 83decd22b44019b0fe369224fb19e1ef21263ab6 (patch) | |
| tree | 0bbbaea9d4231f77a406362904280d6ba53e1d55 /usr/src/man/man1/diff.1 | |
| parent | ad491f11d9af43fd3f0d6159c9e08112de475a54 (diff) | |
| download | illumos-joyent-83decd22b44019b0fe369224fb19e1ef21263ab6.tar.gz | |
OS-8361 IPD 4 (man page renumbering) tracking issue
Reviewed by: Brian Bennett <brian.bennett@joyent.com>
Approved by: Brian Bennett <brian.bennett@joyent.com>
Diffstat (limited to 'usr/src/man/man1/diff.1')
| -rw-r--r-- | usr/src/man/man1/diff.1 | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/usr/src/man/man1/diff.1 b/usr/src/man/man1/diff.1 index 5078d84803..11be316331 100644 --- a/usr/src/man/man1/diff.1 +++ b/usr/src/man/man1/diff.1 @@ -369,7 +369,7 @@ directory file with a filename that is the same as the last component of the non-directory file. .Sh USAGE See -.Xr largefile 5 +.Xr largefile 7 for the description of the behavior of .Nm when encountering files greater than or equal to 2 Gbyte @@ -424,7 +424,7 @@ diff -r dir1/x/date.out dir2/x/date.out .Ed .Sh ENVIRONMENT VARIABLES See -.Xr environ 5 +.Xr environ 7 for descriptions of the following environment variables that affect the execution of .Nm : @@ -461,10 +461,10 @@ is .Xr ed 1 , .Xr pr 1 , .Xr sdiff 1 , -.Xr attributes 5 , -.Xr environ 5 , -.Xr largefile 5 , -.Xr standards 5 +.Xr attributes 7 , +.Xr environ 7 , +.Xr largefile 7 , +.Xr standards 7 .Sh NOTES Editing scripts produced under the .Fl e @@ -473,6 +473,7 @@ or options are na\(:ive about creating lines consisting of a single dot .Sq \&. . .Pp +>>>>>>> master Missing NEWLINE at end of file indicates that the last line of the file in question did not have a NEWLINE. If the lines are different, they will be flagged and output, although the |