Skip to content

implemented diff3 functionality #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rodo-gatti wants to merge 20 commits into
base: main
Choose a base branch
from
Open

implemented diff3 functionality #148

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9b2d4b8
implemented diff3 functionality
rodo-gatti Dec 14, 2025
81eecf6
clippy: fix lints in diff3.rs
rodo-gatti Dec 14, 2025
aeac616
Merge PR #148: clippy fixes in diff3.rs
rodo-gatti Dec 14, 2025
83380d1
fix lints and apply rustfmt to diff3.rs
rodo-gatti Dec 14, 2025
4244b16
Creation of helper function push_file_args. And removed redundant code
rodo-gatti Jan 3, 2026
a8b560b
The dead code is moved to a test module. Implemented missing --strip-…
rodo-gatti Jan 3, 2026
2be77f9
Fixed fmt issues.
rodo-gatti Jan 4, 2026
bcec4c7
Rewrote the confilct detection and output generation functions to pro…
rodo-gatti Jan 4, 2026
a6ecc1d
Rewrite ed script generation to produce valid ed commands
rodo-gatti Jan 4, 2026
cec5b9c
Fixed clippy warnings
rodo-gatti Jan 4, 2026
5c46ca6
Correct exit codes to match GNU diff3 behavior
rodo-gatti Jan 4, 2026
7ac7b5d
Remove unnecessary comments. Enhace error handling
rodo-gatti Jan 4, 2026
d0e8c53
Add bounds checking for region access to prevent overflow
rodo-gatti Jan 4, 2026
804cba1
Remove unused _diff_mine_older, _diff_older_yours, and _diff_mine_you…
rodo-gatti Jan 4, 2026
3422ebc
Replace while let with opts.by_ref().next() to explicitly indicate it…
rodo-gatti Jan 4, 2026
384f8eb
Fixed duplicated stripping in fn compute_diff3
rodo-gatti Jan 4, 2026
fc30711
Add integrationt tests to ensure compatibility with GNU diff3. Fixed …
rodo-gatti Jan 4, 2026
a2bf853
Fix failing CI tests: correct test expectations for initial_tab and N…
rodo-gatti Jan 4, 2026
644ba30
Fixed formating issues
rodo-gatti Jan 4, 2026
6636042
Fix macOS test failure by detecting BSD vs GNU diff3. MacOS ships wit…
rodo-gatti Jan 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Loading