diff options
| author | Jared Yanovich <jaredy@cvs.openbsd.org> | 2004-07-07 14:28:24 +0000 |
|---|---|---|
| committer | Jared Yanovich <jaredy@cvs.openbsd.org> | 2004-07-07 14:28:24 +0000 |
| commit | a8d68d9cb0e3fcaf601296187ca5c2ca499e741b (patch) | |
| tree | 30748e1bf85e6938b336822769f83bcabf5f11e8 /usr.bin | |
| parent | 81f0eb279319d31a8f5064e0f82575f772bf4a7b (diff) | |
- add shell prompt to command example
- fix location of real diff3prog
ok jmc@ otto@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/diff3/diff3.1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/diff3/diff3.1 b/usr.bin/diff3/diff3.1 index 1afbea905ba..5895b4d02f8 100644 --- a/usr.bin/diff3/diff3.1 +++ b/usr.bin/diff3/diff3.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: diff3.1,v 1.3 2003/10/24 08:01:52 jmc Exp $ +.\" $OpenBSD: diff3.1,v 1.4 2004/07/07 14:28:23 jaredy Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -119,7 +119,7 @@ and .Ar file2 . Applying the edit script generated by the command .Pp -.Dl diff3 -E file1 file2 file3 +.Dl $ diff3 -E file1 file2 file3 .Pp to .Ar file1 @@ -173,7 +173,7 @@ as the temporary directory. temporary file .It Pa /tmp/d3b.XXXXXXXXXX temporary file -.It Pa /usr/libexec/diff3 +.It Pa /usr/libexec/diff3prog the actual executable .El .Sh SEE ALSO |