Skip to content

Update ace-diff to fix line merging bugs#2724

Merged
jmthomas merged 2 commits intomainfrom
ace-diff
Jan 10, 2026
Merged

Update ace-diff to fix line merging bugs#2724
jmthomas merged 2 commits intomainfrom
ace-diff

Conversation

@jmthomas
Copy link
Copy Markdown
Member

@jmthomas jmthomas commented Jan 9, 2026

closes #1354

@jmthomas jmthomas requested a review from ryanmelt January 9, 2026 23:45
@jmthomas jmthomas changed the title Ace diff Update ace-diff to fix line merging bugs Jan 9, 2026
@codecov
Copy link
Copy Markdown

codecov bot commented Jan 9, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 79.24%. Comparing base (021674e) to head (37f0d35).
⚠️ Report is 30 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2724   +/-   ##
=======================================
  Coverage   79.24%   79.24%           
=======================================
  Files         664      664           
  Lines       52825    52872   +47     
  Branches      734      734           
=======================================
+ Hits        41863    41901   +38     
- Misses      10882    10891    +9     
  Partials       80       80           
Flag Coverage Δ
python 81.16% <ø> (-0.02%) ⬇️
ruby-api 84.81% <ø> (ø)
ruby-backend 82.16% <ø> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@jmthomas jmthomas merged commit 3ec4018 into main Jan 10, 2026
47 checks passed
@jmthomas jmthomas deleted the ace-diff branch January 10, 2026 00:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Plugin.txt diff sometimes loses new lines when merging

2 participants