https://git.ruby-lang.org/ruby.git/commit/?id=6cd600ef69

From 6cd600ef697ef046651028538ab59233c335e5c6 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Sun, 12 Jul 2020 23:59:18 +0900
Subject: sync_default_gems.rb: Ignore conflicted files in toplevel more


diff --git a/tool/sync_default_gems.rb b/tool/sync_default_gems.rb
index 4cd8ddb..5c70b3c 100644
--- a/tool/sync_default_gems.rb
+++ b/tool/sync_default_gems.rb
@@ -311,7 +311,12 @@ def sync_default_gems(gem) https://github.com/ruby/ruby/blob/trunk/tool/sync_default_gems.rb#L311
   end
 end
 
-IGNORE_FILE_PATTERN = /\A(?:\.travis.yml|appveyor\.yml|azure-pipelines\.yml|\.git(?:ignore|hub)|Gemfile|README\.md|History\.txt|Rakefile|CODE_OF_CONDUCT\.md)/
+IGNORE_FILE_PATTERN =
+  /\A(?:[A-Z]\w*\.(?:md|txt)
+  |[^\/]+\.yml
+  |\.git.*
+  |[A-Z]\w+file
+  )\z/x
 
 def sync_default_gems_with_commits(gem, ranges, edit: nil)
   puts "Sync #{$repositories[gem.to_sym]} with commit history."
-- 
cgit v0.10.2


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