From 306f0d8b2e1f1db840c003b2e4807557b05d83b4 Mon Sep 17 00:00:00 2001
From: "Garen J. Torikian" <gjtorikian@users.noreply.github.com>
Date: Thu, 3 Oct 2024 16:11:17 -0400
Subject: [PATCH 1/2] Add missing logical border color properties

---
 lib/tailwind_merge/config.rb        | 12 ++++++++++++
 test/test_class_map.rb              |  2 ++
 test/test_per_side_border_colors.rb |  3 +++
 3 files changed, 17 insertions(+)

diff --git a/lib/tailwind_merge/config.rb b/lib/tailwind_merge/config.rb
index 548302f..919d524 100644
--- a/lib/tailwind_merge/config.rb
+++ b/lib/tailwind_merge/config.rb
@@ -1134,6 +1134,16 @@ module Config
         ##
         "border-color-y" => [{ "border-y" => [BORDER_COLOR] }],
         ##
+        # Border Color S
+        # @see https://tailwindcss.com/docs/border-color
+        ##
+        "border-color-s" => [{ "border-s" => [BORDER_COLOR] }],
+        ##
+        # Border Color E
+        # @see https://tailwindcss.com/docs/border-color
+        ##
+        "border-color-e" => [{ "border-e" => [BORDER_COLOR] }],
+        ##
         # Border Color Top
         # @see https://tailwindcss.com/docs/border-color
         ##
@@ -1796,6 +1806,8 @@ module Config
         "border-w-x" => ["border-w-r", "border-w-l"],
         "border-w-y" => ["border-w-t", "border-w-b"],
         "border-color" => [
+          "border-color-s",
+          "border-color-e",
           "border-color-t",
           "border-color-r",
           "border-color-b",
diff --git a/test/test_class_map.rb b/test/test_class_map.rb
index 42e9ab9..bd5df60 100644
--- a/test/test_class_map.rb
+++ b/test/test_class_map.rb
@@ -91,8 +91,10 @@ def test_class_map_has_correct_class_groups_at_first_part
             "border-collapse",
             "border-color",
             "border-color-b",
+            "border-color-e",
             "border-color-l",
             "border-color-r",
+            "border-color-s",
             "border-color-t",
             "border-color-x",
             "border-color-y",
diff --git a/test/test_per_side_border_colors.rb b/test/test_per_side_border_colors.rb
index e91d414..4493911 100644
--- a/test/test_per_side_border_colors.rb
+++ b/test/test_per_side_border_colors.rb
@@ -10,5 +10,8 @@ def setup
   def test_merges_classes_with_per_side_border_colors_correctly
     assert_equal("border-t-other-blue", @merger.merge("border-t-some-blue border-t-other-blue"))
     assert_equal("border-some-blue", @merger.merge("border-t-some-blue border-some-blue"))
+
+    assert_equal("border-some-blue border-s-some-blue", @merger.merge("border-some-blue border-s-some-blue"))
+    assert_equal("border-some-blue", @merger.merge("border-e-some-blue border-some-blue"))
   end
 end

From 2a04a350d31941dcc54c2b68da2216ca704124be Mon Sep 17 00:00:00 2001
From: "Garen J. Torikian" <gjtorikian@users.noreply.github.com>
Date: Thu, 3 Oct 2024 16:11:27 -0400
Subject: [PATCH 2/2] :gem: 0.13.1

---
 lib/tailwind_merge/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tailwind_merge/version.rb b/lib/tailwind_merge/version.rb
index a7fe005..bc13474 100644
--- a/lib/tailwind_merge/version.rb
+++ b/lib/tailwind_merge/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TailwindMerge
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end