| Commit message (Collapse) | Author | Files | Lines | ||
|---|---|---|---|---|---|
| 42 hours | Add conflcit resultions strategies and interactive mode, and a lot of testsHEAD1.1master | Mattias Andrée | 1 | -0/+28 | |
| 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 |