Merge changes from emacs-24 branch

[bpt/emacs.git] / lib-src / vcdiff

diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 1fd4f30..dd7ca44 100755 (executable)
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -1,28 +1,29 @@
 #! /bin/sh
-#
+
 # Enhanced sccs diff utility for use with vc mode.
 # This version is more compatible with rcsdiff(1).
-#
-# Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
-#               2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-#
+
+# Copyright (C) 1992-1993, 1995, 1997, 2001-2012
+#   Free Software Foundation, Inc.
+
+# Author: Paul Eggert
+# (according to authors.el)
+
 # This file is part of GNU Emacs.
-#
-# GNU Emacs is free software; you can redistribute it and/or modify
+
+# GNU Emacs is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
-#
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
 # GNU Emacs is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-#
+
 # 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., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 DIFF="diff"
 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..."
@@ -111,4 +112,3 @@ do
        fi
 done
 
-# arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a