pandas-dev
diff --git a/‎pandas/core/reshape/merge.py
Copy file name to clipboardExpand all lines: pandas/core/reshape/merge.py
+1-2Lines changed: 1 addition & 2 deletions b/‎pandas/core/reshape/merge.py
Copy file name to clipboardExpand all lines: pandas/core/reshape/merge.py
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎pandas/tests/reshape/merge/test_merge.py
Copy file name to clipboardExpand all lines: pandas/tests/reshape/merge/test_merge.py
+2-3Lines changed: 2 additions & 3 deletions b/‎pandas/tests/reshape/merge/test_merge.py
Copy file name to clipboardExpand all lines: pandas/tests/reshape/merge/test_merge.py
+2-3Lines changed: 2 additions & 3 deletions
@@ -3070,8 +3070,7 @@ def renamer(x, suffix: str | None):
     dups.update(rlabels.intersection(left.difference(to_rename)))
     if dups:
         raise MergeError(
-            f"Passing 'suffixes' which cause duplicate columns {dups} is "
-            f"not allowed.",
+            f"Passing 'suffixes' which cause duplicate columns {dups} is not allowed.",
         )
 
     return llabels, rlabels
@@ -3066,13 +3066,12 @@ def test_merge_for_suffix_collisions():
     # GH#61402
     # Case 1: suffixes=("_dup", "") test collision
     df1 = DataFrame({"col1": [1], "col2": [2]})
-    df2 = DataFrame({"col1": [1], "col2": [2], "col2_dup": [3]})    
-    with pytest.raises(MergeError, match="duplicate columns"):    
+    df2 = DataFrame({"col1": [1], "col2": [2], "col2_dup": [3]})
+    with pytest.raises(MergeError, match="duplicate columns"):
         merge(df1, df2, on="col1", suffixes=("_dup", ""))
 
     # Case 2: suffixes=("", "_dup") test collision
     df1 = DataFrame({"col1": [1], "col2": [2]})
     df2 = DataFrame({"col1": [1], "col2": [2], "col2_dup": [3]})
     with pytest.raises(MergeError, match="duplicate columns"):
         merge(df1, df2, on="col1", suffixes=("", "_dup"))
-