Mercurial > emacs
comparison lib-src/vcdiff @ 83332:6c13700d1c13
Merged from miles@gnu.org--gnu-2005 (patch 469)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-469
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-372
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Tue, 05 Jul 2005 22:22:24 +0000 |
parents | eb7e8d483840 23a17af379b1 |
children | 532e0a9335a9 |
comparison
equal
deleted
inserted
replaced
83331:efa9e4606e7e | 83332:6c13700d1c13 |
---|---|
18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
19 # GNU General Public License for more details. | 19 # GNU General Public License for more details. |
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., 51 Franklin Street, Fifth Floor, |
24 # Boston, MA 02111-1307, USA. | 24 # Boston, MA 02110-1301, USA. |
25 # | 25 # |
26 | 26 |
27 DIFF="diff" | 27 DIFF="diff" |
28 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..." |
29 | 29 |