https://git.ruby-lang.org/ruby.git/commit/?id=67cde179c5

From 67cde179c5b23f1e8da3cb7554d26c79ed1c3b97 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@r...>
Date: Wed, 7 Aug 2019 22:29:02 +0900
Subject: Skip merge commit created by bundlerbot.


diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 33703d0..379dee4 100644
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -252,7 +252,7 @@ def sync_default_gems_with_commits(gem, range) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L252
     IO.popen(%W"git diff-tree --no-commit-id --name-only -r #{sha}") do |f|
       files = f.read.split("\n")
     end
-    subject =~ /^Merge/ || files.all?{|file| file =~ IGNORE_FILE_PATTERN}
+    subject =~ /^Merge/ || subject =~ /^Auto Merge/ || files.all?{|file| file =~ IGNORE_FILE_PATTERN}
   end
 
   puts "Try to pick these commits:"
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/