From owner-svn-soc-all@FreeBSD.ORG  Wed Jul 18 16:12:29 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 588901065674
	for <svn-soc-all@FreeBSD.org>; Wed, 18 Jul 2012 16:12:28 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Wed, 18 Jul 2012 16:12:28 +0000
Date: Wed, 18 Jul 2012 16:12:28 +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: <20120718161228.588901065674@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r239552 - 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: Wed, 18 Jul 2012 16:12:29 -0000

Author: jhagewood
Date: Wed Jul 18 16:12:27 2012
New Revision: 239552
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239552

Log:
  list of todos

Added:
  soc2012/jhagewood/diff3/TODO

Added: soc2012/jhagewood/diff3/TODO
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ soc2012/jhagewood/diff3/TODO	Wed Jul 18 16:12:27 2012	(r239552)
@@ -0,0 +1,6 @@
+--show-all		INCOMPLETE
+--easy-only		INCOMPLETE
+--merge			INCOMPLETE
+--label			INCOMPLETE
+--strip-trailing-cr	COMPLETE
+--diff-program		INCOMPLETE