aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorsorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-22 05:35:05 +0000
committersorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-22 05:35:05 +0000
commit06aeddaf926a38c6ff436988b6ed373a00fb23df (patch)
treef9340633a249511d895e27ea2137c92b00beee33 /ChangeLog
parenta790bd0bd775927583ff5502b4ccd54e6cfb0706 (diff)
downloadruby-06aeddaf926a38c6ff436988b6ed373a00fb23df.tar.gz
* lib/test/unit.rb: Fix merging miss.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30940 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ea4b6da606..af2ecc88cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 22 14:34:26 2011 Shota Fukumori (sora_h) <sorah@tubusu.net>
+
+ * lib/test/unit.rb: Fix merging miss.
+
Tue Feb 22 12:27:26 2011 Shota Fukumori (sora_h) <sorah@tubusu.net>
* lib/test/unit.rb: Add new options; --jobs,-j,--ruby,--jobs-status,