summaryrefslogtreecommitdiff
path: root/tool/merger.rb
diff options
context:
space:
mode:
Diffstat (limited to 'tool/merger.rb')
-rwxr-xr-xtool/merger.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/tool/merger.rb b/tool/merger.rb
index a134d84c2d5..961bb20f1b5 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|