merge revision(s) 39358:

	* tool/merger.rb: add interaction when only ChangeLog is modified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/tool/merger.rb b/tool/merger.rb
index a134d84c2d..961bb20f1b 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -192,6 +192,11 @@ else
     system *%w'svn revert ChangeLog' if /^\+/ =~ l
   end
 
+  if `svn diff --diff-cmd=diff -x -upw`.empty?
+    interactive 'Only ChangeLog is modified, right?' do
+    end
+  end
+
   if /^\+/ =~ log
     system *%w'svn revert ChangeLog'
     IO.popen %w'patch -p0', 'wb' do |f|