Date: Thu, 09 Aug 2012 17:32:27 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r240216 - soc2012/jhagewood/diff3 Message-ID: <20120809173227.9B39F106564A@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120809173227.9B39F106564A>