diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2002-02-12 09:50:16 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2002-02-12 09:50:16 +0000 |
| commit | cf767f1d8e8ad7df9cf217ac3f5386a9377d0c1d (patch) | |
| tree | cc81d142698b31c75d91c0a317be17199a2dc6a4 /usr.sbin/mergemaster/mergemaster.8 | |
| parent | 7416057d53c967aea19d33a69ef35a1209eab1c1 (diff) | |
| download | src-cf767f1d8e8ad7df9cf217ac3f5386a9377d0c1d.tar.gz src-cf767f1d8e8ad7df9cf217ac3f5386a9377d0c1d.zip | |
* Update (c)
* Expand on the definition of the -s (strict) option, at the suggestion
of Gary W. Swearingen, swear@blarg.net.
Notes
Notes:
svn path=/head/; revision=90563
Diffstat (limited to 'usr.sbin/mergemaster/mergemaster.8')
| -rw-r--r-- | usr.sbin/mergemaster/mergemaster.8 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/mergemaster.8 b/usr.sbin/mergemaster/mergemaster.8 index 37c3edbc36e1..0ac6ae340006 100644 --- a/usr.sbin/mergemaster/mergemaster.8 +++ b/usr.sbin/mergemaster/mergemaster.8 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998-2001 Douglas Barton +.\" Copyright (c) 1998-2002 Douglas Barton .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -148,6 +148,8 @@ The options are as follows: .Bl -tag -width Fl .It Fl s Perform a strict comparison, diff'ing every pair of files. +This comparison is performed line by line, +without regard to CVS $Id's. .It Fl c Use context diffs instead of unified diffs. .It Fl r |