File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed
Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -7,11 +7,11 @@ class MergeType(IntFlag):
77 """List objects are combined onto one long list (NOT a set). This is the default flag."""
88
99 REPLACE = auto ()
10- """Instead of combining list objects, when 2 list objects are at an equal depth of merge, replace the destination
10+ """Instead of combining list objects, when 2 list objects are at an equal depth of merge, replace the destination \
1111 with the source."""
1212
1313 TYPESAFE = auto ()
14- """When 2 keys at equal levels are of different types, raise a TypeError exception. By default, the source
14+ """When 2 keys at equal levels are of different types, raise a TypeError exception. By default, the source \
1515 replaces the destination in this situation."""
1616
1717
You can’t perform that action at this time.
0 commit comments