diff options
Diffstat (limited to 'usr/src/man/man1/diff.1')
| -rw-r--r-- | usr/src/man/man1/diff.1 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/usr/src/man/man1/diff.1 b/usr/src/man/man1/diff.1 index 3069149285..11be316331 100644 --- a/usr/src/man/man1/diff.1 +++ b/usr/src/man/man1/diff.1 @@ -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 |