From owner-svn-soc-all@FreeBSD.ORG  Thu Aug  9 17:32:28 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f])
	by hub.freebsd.org (Postfix) with SMTP id 9B39F106564A
	for <svn-soc-all@FreeBSD.org>; Thu,  9 Aug 2012 17:32:27 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Thu, 09 Aug 2012 17:32:27 +0000
Date: Thu, 09 Aug 2012 17:32:27 +0000
From: jhagewood@FreeBSD.org
To: svn-soc-all@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <20120809173227.9B39F106564A@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r240216 - soc2012/jhagewood/diff3
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Aug 2012 17:32:28 -0000

Author: jhagewood
Date: Thu Aug  9 17:32:26 2012
New Revision: 240216
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240216

Log:

Modified:
  soc2012/jhagewood/diff3/diff3prog.c

Modified: soc2012/jhagewood/diff3/diff3prog.c
==============================================================================
--- soc2012/jhagewood/diff3/diff3prog.c	Thu Aug  9 16:38:17 2012	(r240215)
+++ soc2012/jhagewood/diff3/diff3prog.c	Thu Aug  9 17:32:26 2012	(r240216)
@@ -125,7 +125,7 @@
 int  overlapcnt;
 FILE *fp[3];
 int cline[3];		/* # of the last-read line in each file (0-2) */
-char *diff_prog = NULL;
+char *diff_prog = "/usr/bin/diff";
 char *labels[3] = {NULL};
 /*
  * The latest known correspondence between line numbers of the 3 files