implemented diff3 functionality#148

Open

rodo-gatti wants to merge 20 commits intouutils:mainfrom

rodo-gatti:main

Commits on Jan 3, 2026

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

Commits on Jan 4, 2026

Fixed fmt issues.
rodo-gatti
committed
Rewrote the confilct detection and output generation functions to properly implement three-wat merge semantics.
rodo-gatti
committed
Rewrite ed script generation to produce valid ed commands
rodo-gatti
committed
Fixed clippy warnings
rodo-gatti
committed
Correct exit codes to match GNU diff3 behavior
rodo-gatti
committed
Remove unnecessary comments. Enhace error handling
rodo-gatti
committed
Add bounds checking for region access to prevent overflow
rodo-gatti
committed
Remove unused _diff_mine_older, _diff_older_yours, and _diff_mine_yours parameters from output generation functions
rodo-gatti
committed
Replace while let with opts.by_ref().next() to explicitly indicate iterator borrowing
rodo-gatti
committed
Fixed duplicated stripping in fn compute_diff3
rodo-gatti
committed
Add integrationt tests to ensure compatibility with GNU diff3. Fixed compatibility issues.
rodo-gatti
committed
Fix failing CI tests: correct test expectations for initial_tab and Normal format conflict behavior
rodo-gatti
committed
Fixed formating issues
rodo-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…
rodo-gatti
committed