Skip to content

Commit d456359

Browse files
joskeclaude
andauthored
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

File tree

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mergers"
3-
version = "0.5.3"
3+
version = "0.5.4"
44
edition = "2024"
55
description = "A visual diff and merge tool for files and directories"
66
license = "GPL-2.0"

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,9 @@ mergers file1.txt file2.txt -L "Original" -L "Modified"
9696
To use mergers as your git merge tool:
9797

9898
```bash
99-
git config merge.tool mergers
100-
git config mergetool.mergers.cmd 'mergers "$LOCAL" "$MERGED" "$REMOTE"'
101-
git config mergetool.mergers.trustExitCode true
99+
git config --global merge.tool mergers
100+
git config --global mergetool.mergers.cmd 'mergers "$LOCAL" "$MERGED" "$REMOTE"'
101+
git config --global mergetool.mergers.trustExitCode true
102102
```
103103

104104
Then resolve conflicts with:

0 commit comments

Comments
 (0)