Skip to content

Commit

Permalink
improvement
Browse files Browse the repository at this point in the history
  • Loading branch information
jevanlingen committed Nov 22, 2024
1 parent d21afa9 commit 35948c7
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ private Mapping mergeMapping(Yaml.Mapping m1, Yaml.Mapping m2, P p, Cursor curso
if (!mergedEntries.isEmpty() && it.getValue() instanceof Yaml.Scalar && hasLineBreak(mergedEntries.get(0), 2)) {
return it.withPrefix(lineSeparator() + grabAfterFirstLineBreak(mergedEntries.get(0)));
}
return shouldAutoFormat ? MergeYamlVisitor.this.autoFormat(it, p, cursor) : it;
return shouldAutoFormat ? autoFormat(it, p, cursor) : it;
}));

if (m1.getEntries().size() < mutatedEntries.size() && !getCursor().isRoot()) {
Expand Down

0 comments on commit 35948c7

Please sign in to comment.