| Commit message (Collapse) | Author | Files | Lines | ||
|---|---|---|---|---|---|
| 2 days | Add support for combining --merge and --symmetricHEAD1.3master | Mattias Andrée | 1 | -1/+1 | |
| Signed-off-by: Mattias Andrée <m@maandree.se> | |||||
| 5 days | Add conflcit resultions strategies and interactive mode, and a lot of tests1.1 | Mattias Andrée | 1 | -0/+23 | |
| 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 |