# 
# patch "ChangeLog"
#  from [15b5a7c02b727b014a94957cfbf468a2371d5af1]
#    to [c3299baff4e545677462e9d16a5b701caabf9b31]
# 
# patch "tests/t_diff_binary.at"
#  from [651f781bf58848169446baee444f3f1418b7b24f]
#    to [de45d9dca34e5765bd998968752d25368c8238e1]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
 2005-04-16  Nathaniel Smith  <address@hidden>
 
+	* tests/t_diff_binary.at: Un-XFAIL.
+
+2005-04-16  Nathaniel Smith  <address@hidden>
+
 	* monotone.texi (Network Service): Rewrite to include former
 	Exchanging Keys section.
 	(Branching and Merging): New tutorial section, inspired by a patch
--- tests/t_diff_binary.at
+++ tests/t_diff_binary.at
@@ -1,10 +1,7 @@
 AT_SETUP([diff a binary file])
 MONOTONE_SETUP
 NEED_UNGZB64
 
-# This test is a bug report.
-AT_XFAIL_IF(true)
-
 # diff should probably not display the contents of binary files
 
 AT_DATA(binary.gz.b64,