Commit d456359
More color fixes (#29)
* update readme
* Fix merge conflict coloring on side panes and empty lines
- Add source marks for conflict backgrounds (visible on empty lines
unlike paragraph_background tags in GTK4)
- Compute merged conflict regions from middle pane to correctly detect
which side-pane chunks fall within conflict zones
- Absorb equal gaps within conflict regions regardless of size so
side-pane conflict bands match the middle pane
- Skip filler lines inside conflict bands to avoid stray colored lines
- Update diff tag colors on scheme change for dark/light awareness
- Fix README merge tool config to use --global flag
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* Brighten dark-mode diff colors for readability
Previous dark values were too subtle and blended into dark backgrounds,
making diffs hard to read especially on macOS. Increase brightness of
chunk backgrounds, inline highlights, strokes, bands, and search colors.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
* bump to 0.5.4
---------
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>1 parent 3850e19 commit d456359
6 files changed
Lines changed: 673 additions & 84 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
99 | | - | |
100 | | - | |
101 | | - | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
102 | 102 | | |
103 | 103 | | |
104 | 104 | | |
| |||
0 commit comments