| Commit message (Collapse) | Author | Files | Lines | ||
|---|---|---|---|---|---|
| 5 days | Make ^L redrawHEAD1.3.1master | Mattias Andrée | 2 | -0/+37 | |
| Signed-off-by: Mattias Andrée <m@maandree.se> | |||||
| 2026-09-25 | Add support for combining --merge and --symmetric1.3 | Mattias Andrée | 5 | -84/+105 | |
| Signed-off-by: Mattias Andrée <m@maandree.se> | |||||
| 2026-09-24 | Add --symmetric1.2 | Mattias Andrée | 39 | -11/+769 | |
| Signed-off-by: Mattias Andrée <m@maandree.se> | |||||
| 2026-09-22 | Add conflcit resultions strategies and interactive mode, and a lot of tests1.1 | Mattias Andrée | 181 | -0/+4937 | |
| Signed-off-by: Mattias Andrée <m@maandree.se> | |||||
 |
index : git-rediff | |
| [Complete] Reduce partially resolved merge conflicts | Mattias Andrée <m@maandree.se> |
| aboutsummaryrefslogtreecommitdiffstats |