implemented diff3 functionality#148

Closed

ghost wants to merge 20 commits intomainfrom

unknown repository

Commits on Dec 14, 2025

implemented diff3 functionality
Rodolfo Gatti
committed
clippy: fix lints in diff3.rs
Rodolfo Gatti
committed
Merge PR #148: clippy fixes in diff3.rs
Rodolfo Gatti
committed
fix lints and apply rustfmt to diff3.rs
Rodolfo Gatti
committed

Commits on Jan 3, 2026

Creation of helper function push_file_args. And removed redundant code
Rodolfo Gatti
committed
The dead code is moved to a test module. Implemented missing --strip-trailing-cr and -T / --initial-tab logic.
Rodolfo Gatti
committed

Commits on Jan 4, 2026

Fixed fmt issues.
Rodolfo Gatti
committed
Rewrote the confilct detection and output generation functions to properly implement three-wat merge semantics.
Rodolfo Gatti
committed
Rewrite ed script generation to produce valid ed commands
Rodolfo Gatti
committed
Fixed clippy warnings
Rodolfo Gatti
committed
Correct exit codes to match GNU diff3 behavior
Rodolfo Gatti
committed
Remove unnecessary comments. Enhace error handling
Rodolfo Gatti
committed
Add bounds checking for region access to prevent overflow
Rodolfo Gatti
committed
Remove unused _diff_mine_older, _diff_older_yours, and _diff_mine_yours parameters from output generation functions
Rodolfo Gatti
committed
Replace while let with opts.by_ref().next() to explicitly indicate iterator borrowing
Rodolfo Gatti
committed
Fixed duplicated stripping in fn compute_diff3
Rodolfo Gatti
committed
Add integrationt tests to ensure compatibility with GNU diff3. Fixed compatibility issues.
Rodolfo Gatti
committed
Fix failing CI tests: correct test expectations for initial_tab and Normal format conflict behavior
Rodolfo Gatti
committed
Fixed formating issues
Rodolfo Gatti
committed
Fix macOS test failure by detecting BSD vs GNU diff3. MacOS ships with BSD diff3 which has different exit code behavior for the -E flag compared to GNU diff3. Added is_gnu_diff3() helper and modifi…
Rodolfo Gatti
committed