Mercurial > emacs
comparison lib-src/vcdiff @ 89909:68c22ea6027c
Sync to HEAD
author | Kenichi Handa <handa@m17n.org> |
---|---|
date | Fri, 16 Apr 2004 12:51:06 +0000 |
parents | 375f2633d815 |
children | f9a65d7ebd29 |
comparison
equal
deleted
inserted
replaced
89908:ee1402f7b568 | 89909:68c22ea6027c |
---|---|
1 #! /bin/sh | 1 #! /bin/sh |
2 # | 2 # |
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. |
10 # | 10 # |
11 # GNU Emacs is free software; you can redistribute it and/or modify | 11 # GNU Emacs is free software; you can redistribute it and/or modify |
20 # | 20 # |
21 # You should have received a copy of the GNU General Public License | 21 # You should have received a copy of the GNU General Public License |
22 # along with GNU Emacs; see the file COPYING. If not, write to the | 22 # along with GNU Emacs; see the file COPYING. If not, write to the |
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 # | |
26 # $Id: vcdiff,v 1.6 1997/01/01 05:33:42 eggert Exp $ | |
27 # | 25 # |
28 | 26 |
29 DIFF="diff" | 27 DIFF="diff" |
30 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." | 28 usage="$0: Usage: vcdiff [--brief] [-q] [-r<sid1>] [-r<sid2>] [diffopts] sccsfile..." |
31 | 29 |
109 | 107 |
110 if test $status -lt $s | 108 if test $status -lt $s |
111 then status=$s | 109 then status=$s |
112 fi | 110 fi |
113 done | 111 done |
112 | |
113 # arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a |