diff options
Diffstat (limited to 'tool/sync_default_gems.rb')
| -rw-r--r-- | tool/sync_default_gems.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb index 33703d0492..379dee4a16 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) 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:" |