Skip to content

Commit

Permalink
Use record update
Browse files Browse the repository at this point in the history
  • Loading branch information
yairchu committed Nov 25, 2024
1 parent 6527953 commit 33f49f0
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/Resolution.hs
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,8 @@ resolveContent opts =
go (Left line) = NewContent mempty (unlines [line])
go (Right conflict)
| opts.splitMarkers =
NewContent
{ newContent = r.newContent
, result =
r
{ result =
if r.result.failedToResolve + r.result.reducedConflicts > 0
then mempty {reducedConflicts = 1} -- The split is a reduction
else mempty {resolvedSuccessfully = 1}
Expand Down

0 comments on commit 33f49f0

Please sign in to comment.