=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff3/diff3.ksh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- src/usr.bin/diff3/diff3.ksh 2003/07/31 11:16:58 1.2 +++ src/usr.bin/diff3/diff3.ksh 2006/01/28 07:27:38 1.3 @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: diff3.ksh,v 1.2 2003/07/31 11:16:58 millert Exp $ +# $OpenBSD: diff3.ksh,v 1.3 2006/01/28 07:27:38 tedu Exp $ # # Copyright (c) 2003 Todd C. Miller # @@ -59,7 +59,7 @@ exit 1 fi trap "/bin/rm -f $TMP1 $TMP2" 0 1 2 13 15 -diff $dflags $1 $3 > $TMP1 -diff $dflags $2 $3 > $TMP2 -$diff3prog $d3flags $TMP1 $TMP2 $1 $2 $3 +diff $dflags -- $1 $3 > $TMP1 +diff $dflags -- $2 $3 > $TMP2 +$diff3prog $d3flags -- $TMP1 $TMP2 $1 $2 $3 exit $?