From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Mar 2012 23:09:15 +0000 (-0800)
Subject: Meta/TODO: remove an stale item on diff --cc
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98193eafc6be4055eb9751cbd2f31440fbfe8bcc;p=thirdparty%2Fgit.git

Meta/TODO: remove an stale item on diff --cc
---

diff --git a/TODO b/TODO
index 1271bbbfb4..1366509c9e 100644
--- a/TODO
+++ b/TODO
@@ -16,11 +16,6 @@ gmane=http://thread.gmane.org/gmane.comp.version-control.git/
 
   $gmane/173610
 
-* The "combined" diff always assumes it deals with text files. Teach it
-  to punt on binary and also use the textconv.
-
-  $gname/171613
-
 * Audit use of symbolic-ref without -m in our scripts and for each
   case decide if leaving a reflog entry for the HEAD is desirable.
   If so, add them.