diff options
| author | dougb <dougb@FreeBSD.org> | 2002-02-12 09:50:16 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2002-02-12 09:50:16 +0000 |
| commit | e9ff6763fb5d8b7737c1381a10fcaf6b9e943c0e (patch) | |
| tree | cc81d142698b31c75d91c0a317be17199a2dc6a4 /usr.sbin | |
| parent | 227185b1bb4304ee393f1f82e3c9620ca301b2cd (diff) | |
| download | FreeBSD-src-e9ff6763fb5d8b7737c1381a10fcaf6b9e943c0e.zip FreeBSD-src-e9ff6763fb5d8b7737c1381a10fcaf6b9e943c0e.tar.gz | |
* Update (c)
* Expand on the definition of the -s (strict) option, at the suggestion
of Gary W. Swearingen, swear@blarg.net.
Diffstat (limited to 'usr.sbin')
| -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 37c3edb..0ac6ae3 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 |
