From owner-svn-soc-all@FreeBSD.ORG  Tue Jun  5 20:14:05 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 6BF65106566B
	for <svn-soc-all@FreeBSD.org>; Tue,  5 Jun 2012 20:14:03 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Tue, 05 Jun 2012 20:14:03 +0000
Date: Tue, 05 Jun 2012 20:14:03 +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: <20120605201403.6BF65106566B@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r237160 - in soc2012/jhagewood/diff3: . 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: Tue, 05 Jun 2012 20:14:05 -0000

Author: jhagewood
Date: Tue Jun  5 20:14:03 2012
New Revision: 237160
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237160

Log:

Modified:
  soc2012/jhagewood/diff3/diff3/diff3prog.c
  soc2012/jhagewood/diff3/hagewood-diff3.patch

Modified: soc2012/jhagewood/diff3/diff3/diff3prog.c
==============================================================================
--- soc2012/jhagewood/diff3/diff3/diff3prog.c	Tue Jun  5 20:13:02 2012	(r237159)
+++ soc2012/jhagewood/diff3/diff3/diff3prog.c	Tue Jun  5 20:14:03 2012	(r237160)
@@ -625,7 +625,8 @@
 		(void)fseek(fp[i], (long)-nchar, SEEK_CUR);
 }
 
-/* If file has trailing carriage return, remove it. 
+/* 
+ * If file has trailing carriage return, remove it. 
  */
 void
 remove_cr(FILE *f) {

Modified: soc2012/jhagewood/diff3/hagewood-diff3.patch
==============================================================================
--- soc2012/jhagewood/diff3/hagewood-diff3.patch	Tue Jun  5 20:13:02 2012	(r237159)
+++ soc2012/jhagewood/diff3/hagewood-diff3.patch	Tue Jun  5 20:14:03 2012	(r237160)
@@ -11,7 +11,7 @@
  .include <bsd.prog.mk>
 diff -rupN jhagewood/diff3/diff3-orig/diff3prog.c jhagewood/diff3/diff3/diff3prog.c
 --- jhagewood/diff3/diff3-orig/diff3prog.c	2012-06-04 23:30:11.000000000 -0400
-+++ jhagewood/diff3/diff3/diff3prog.c	2012-06-05 20:10:22.000000000 -0400
++++ jhagewood/diff3/diff3/diff3prog.c	2012-06-05 20:13:52.000000000 -0400
 @@ -82,6 +82,9 @@
  
  /* diff3 - 3-way differential file comparison */
@@ -110,11 +110,12 @@
  	}
  	merge(m, n);
  	exit(EXIT_SUCCESS);
-@@ -606,6 +625,31 @@ repos(int nchar)
+@@ -606,6 +625,32 @@ repos(int nchar)
  		(void)fseek(fp[i], (long)-nchar, SEEK_CUR);
  }
  
-+/* If file has trailing carriage return, remove it. 
++/* 
++ * If file has trailing carriage return, remove it. 
 + */
 +void
 +remove_cr(FILE *f) {
@@ -142,7 +143,7 @@
  __dead void
  trouble(void)
  {
-@@ -699,12 +743,38 @@ increase(void)
+@@ -699,12 +744,38 @@ increase(void)
  }