X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/a2de0c3b755f982b426e915e3d1064a10f6206bb..d5085af01f3c3f4ff83ca94b029959784fe29253:/lib-src/vcdiff diff --git a/lib-src/vcdiff b/lib-src/vcdiff index 9c513ac820..2cba89df42 100755 --- a/lib-src/vcdiff +++ b/lib-src/vcdiff @@ -3,8 +3,8 @@ # Enhanced sccs diff utility for use with vc mode. # This version is more compatible with rcsdiff(1). # -# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2004 -# Free Software Foundation, Inc. +# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -20,8 +20,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Emacs; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # DIFF="diff" @@ -29,7 +29,7 @@ usage="$0: Usage: vcdiff [--brief] [-q] [-r] [-r] [diffopts] sccsfil PATH=$PATH:/usr/ccs/bin:/usr/sccs:/usr/xpg4/bin # common SCCS hangouts -echo= +echo="echo" sid1= sid2= for f @@ -96,7 +96,7 @@ do workfile=$rev2 esac then - $echo $DIFF $options $sid1 $sid2 $workfile >&2 + $echo $DIFF $options $rev1 $workfile >&2 $DIFF $options $rev1 $workfile s=$? fi