From c37ff62e9be62a7cd6340caca3316bb40062ac2d Mon Sep 17 00:00:00 2001 From: peter Date: Sat, 28 Oct 1995 19:11:01 +0000 Subject: 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.. --- gnu/usr.bin/diff/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/usr.bin/diff/version.c') 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"; -- cgit v1.1