diff options
| author | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-02-22 22:35:12 +0000 |
|---|---|---|
| committer | Jason McIntyre <jmc@cvs.openbsd.org> | 2006-02-22 22:35:12 +0000 |
| commit | 17f9a845b52ea5e9b78834ac3dae0bd92a2cebb9 (patch) | |
| tree | 9a381ccd89185c6eb2a59de660738d686c83aaee /usr.bin/diff3/diff3.ksh | |
| parent | a8a9c8f86716e13464ea7c33ba33006e4f85ad5a (diff) | |
sort options + sync usage();
Diffstat (limited to 'usr.bin/diff3/diff3.ksh')
| -rw-r--r-- | usr.bin/diff3/diff3.ksh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/diff3/diff3.ksh b/usr.bin/diff3/diff3.ksh index 65ac1b92575..2d78adb0aed 100644 --- a/usr.bin/diff3/diff3.ksh +++ b/usr.bin/diff3/diff3.ksh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: diff3.ksh,v 1.3 2006/01/28 07:27:38 tedu Exp $ +# $OpenBSD: diff3.ksh,v 1.4 2006/02/22 22:35:11 jmc Exp $ # # Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com> # @@ -26,7 +26,7 @@ OPTIND=1 # force getopts to reset itself export PATH=/bin:/usr/bin diff3prog=/usr/libexec/diff3prog -USAGE="usage: diff3 [-aexEX3] file1 file2 file3" +USAGE="usage: diff3 [-3aEeXx] file1 file2 file3" # Pull out any command line flags (some for diff, some for diff3) dflags= |