![[BACK]](/icons/back.gif){kind=icon}
Return to diff3.ksh CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / diff3|
Return to diff3.ksh CVS log | Up to [local] / src / usr.bin / diff3 |
| version 1.3, 2006/01/28 07:27:38 | version 1.4, 2006/02/22 22:35:11 | ||
|---|---|---|---|
|
|
||
| export PATH=/bin:/usr/bin | export PATH=/bin:/usr/bin | ||
| diff3prog=/usr/libexec/diff3prog | 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) | # Pull out any command line flags (some for diff, some for diff3) | ||
| dflags= | dflags= |