| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Add support for combining --merge and --symmetricHEAD1.3master | Mattias Andrée | 4 hours | 1 | -60/+52 |
| | | | | | Signed-off-by: Mattias Andrée <m@maandree.se> | ||||
| * | Add --symmetric1.2 | Mattias Andrée | 24 hours | 1 | -0/+49 |
| | | | | | 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 | -0/+20 |
| 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 |