| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add support for combining --merge and --symmetricHEAD1.3master | Mattias Andrée | 2 hours | 1 | -4/+5 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | Add --symmetric1.2 | Mattias Andrée | 22 hours | 1 | -0/+33 |
| | | | | | 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 | -4/+206 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | First commit | Mattias Andrée | 2024-08-15 | 1 | -0/+37 |
| 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 |