diff options
| author | Joakim Verona | 2011-02-05 11:23:09 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-02-05 11:23:09 +0100 |
| commit | 4bd51ad5c3445b644dfb017d5b57b10a90aa325f (patch) | |
| tree | 894801e7308ce4ecc34933f959e28f4b9cff9533 /lib-src/vcdiff | |
| parent | 13cfe8df462ab8da9f0028e16cc84dcaceaca3d1 (diff) | |
| parent | 9bcaafce5351d270ac514e23cb69ff1a5fd35229 (diff) | |
| download | emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.tar.gz emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.zip | |
merge from upstream. currently seems to have bitroted and i get segfaults
Diffstat (limited to 'lib-src/vcdiff')
| -rwxr-xr-x | lib-src/vcdiff | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib-src/vcdiff b/lib-src/vcdiff index 1d08e5d194f..0f975cd0ee3 100755 --- a/lib-src/vcdiff +++ b/lib-src/vcdiff | |||
| @@ -3,8 +3,8 @@ | |||
| 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, 2002, 2003, 2004, 2005, | 6 | # Copyright (C) 1992-1993, 1995, 1997, 2001-2011 |
| 7 | # 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 7 | # Free Software Foundation, Inc. |
| 8 | 8 | ||
| 9 | # Author: Paul Eggert | 9 | # Author: Paul Eggert |
| 10 | # (according to authors.el) | 10 | # (according to authors.el) |
| @@ -112,4 +112,3 @@ do | |||
| 112 | fi | 112 | fi |
| 113 | done | 113 | done |
| 114 | 114 | ||
| 115 | # arch-tag: 4344ba3a-bcbe-4f77-971c-f43c1606953a | ||