diff options
author | peter <peter@FreeBSD.org> | 1995-10-28 19:11:01 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1995-10-28 19:11:01 +0000 |
commit | c37ff62e9be62a7cd6340caca3316bb40062ac2d (patch) | |
tree | 987fcf998a10323a27da08d8512088fb01e8396f /gnu/usr.bin/diff/version.c | |
parent | 72fa7ec057bc2d7930e60d59f3936afe1de4bc11 (diff) | |
download | FreeBSD-src-c37ff62e9be62a7cd6340caca3316bb40062ac2d.zip FreeBSD-src-c37ff62e9be62a7cd6340caca3316bb40062ac2d.tar.gz |
Merge in/out comflicts caused by Diffutils-2.7 import...
In future, it should be as easy as "update -j ....", but this time I had to
go over it by hand. Not nice..
Diffstat (limited to 'gnu/usr.bin/diff/version.c')
-rw-r--r-- | gnu/usr.bin/diff/version.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/usr.bin/diff/version.c b/gnu/usr.bin/diff/version.c index 234ec29..c2b6a8a 100644 --- a/gnu/usr.bin/diff/version.c +++ b/gnu/usr.bin/diff/version.c @@ -2,4 +2,4 @@ #include "config.h" -char const version_string[] = "2.6"; +char const version_string[] = "2.7"; |