aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-06 12:55:56 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-02-06 12:55:56 +0000
commitb33dc193c84598c71e088010f40267dce141fda0 (patch)
tree88f690b0b3f1b940655392405d050d31793df560 /ChangeLog
parent730d3c566c149cc22997828e5941699280958ac9 (diff)
downloadruby-b33dc193c84598c71e088010f40267dce141fda0.tar.gz
* tool/merger.rb: abort if the working directory is dirty.
* tool/merger.rb: update the working directory after commit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 27655a1ec1..9b0668caac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 6 21:55:13 2012 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/merger.rb: abort if the working directory is dirty.
+
+ * tool/merger.rb: update the working directory after commit.
+
Mon Feb 6 00:16:27 2012 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string