aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src/vcdiff
diff options
context:
space:
mode:
authorKenichi Handa2004-04-16 12:51:06 +0000
committerKenichi Handa2004-04-16 12:51:06 +0000
commit6b61353c0a0320ee15bb6488149735381fed62ec (patch)
treee69adba60e504a5a37beb556ad70084de88a7aab /lib-src/vcdiff
parentdc6a28319312fe81f7a1015e363174022313f0bd (diff)
downloademacs-6b61353c0a0320ee15bb6488149735381fed62ec.tar.gz
emacs-6b61353c0a0320ee15bb6488149735381fed62ec.zip
Sync to HEAD
Diffstat (limited to 'lib-src/vcdiff')
-rwxr-xr-xlib-src/vcdiff6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 5fdc345eb98..9c513ac8200 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -3,7 +3,7 @@
3# Enhanced sccs diff utility for use with vc mode. 3# Enhanced sccs diff utility for use with vc mode.
4# This version is more compatible with rcsdiff(1). 4# This version is more compatible with rcsdiff(1).
5# 5#
6# Copyright (C) 1992, 1993, 1995, 1997, 2001 6# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2004
7# Free Software Foundation, Inc. 7# Free Software Foundation, Inc.
8# 8#
9# This file is part of GNU Emacs. 9# This file is part of GNU Emacs.
@@ -23,8 +23,6 @@
23# Free Software Foundation, Inc., 59 Temple Place - Suite 330, 23# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
24# Boston, MA 02111-1307, USA. 24# Boston, MA 02111-1307, USA.
25# 25#
26# $Id: vcdiff,v 1.6 1997/01/01 05:33:42 eggert Exp $
27#
28 26
29DIFF="diff" 27DIFF="diff"
30usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." 28usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
@@ -111,3 +109,5 @@ do
111 then status=$s 109 then status=$s
112 fi 110 fi
113done 111done
112
113# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a