Repository navigation

implemented diff3 functionality - #148

Closed

ghost wants to merge 20 commits into

mainfrom

unknown repository

Closed

implemented diff3 functionality#148
ghost wants to merge 20 commits into
mainfrom
unknown repository

Commits on Dec 14, 2025
- implemented diff3 functionality
  rodo-gatti
  committed
  9b2d4b8
- clippy: fix lints in diff3.rs
  rodo-gatti
  committed
  81eecf6
- Merge PR #148: clippy fixes in diff3.rs
  rodo-gatti
  committed
  aeac616
- fix lints and apply rustfmt to diff3.rs
  rodo-gatti
  committed
  83380d1
Commits on Jan 3, 2026
- Creation of helper function push_file_args. And removed redundant code
  rodo-gatti
  committed
  4244b16
- The dead code is moved to a test module. Implemented missing --strip-trailing-cr and -T / --initial-tab logic.
  rodo-gatti
  committed
  a8b560b
Commits on Jan 4, 2026