| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add support for combining --merge and --symmetricHEAD1.3master | Mattias Andrée | 3 hours | 1 | -1/+1 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | Add --symmetric1.2 | Mattias Andrée | 23 hours | 1 | -13/+35 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | Add conflcit resultions strategies and interactive mode, and a lot of tests1.1 | Mattias Andrée | 3 days | 1 | -1/+76 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | fix doc text1.0.5 | Mattias Andrée | 2026-02-22 | 1 | -1/+1 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | Fix typo | Mattias Andrée | 2024-08-15 | 1 | -1/+1 |
| | | | | | Signed-off-by: Mattias Andrée <maandree@kth.se> | ||||
| * | Add README and git-rediff.1 | Mattias Andrée | 2024-08-15 | 1 | -0/+27 |
| Signed-off-by: Mattias Andrée <maandree@kth.se> | |||||
 |
index : git-rediff | |
| [Complete] Reduce partially resolved merge conflicts | Mattias Andrée <m@maandree.se> |
| aboutsummaryrefslogtreecommitdiffstats |