| Commit message (Expand) | Author | Files | Lines | |
|---|---|---|---|---|
| 38 hours | Add conflcit resultions strategies and interactive mode, and a lot of testsHEAD1.1master | Mattias Andrée | 181 | -0/+4937 |
 |
index : git-rediff | |
| [Complete] Reduce partially resolved merge conflicts | Mattias Andrée <m@maandree.se> |
| aboutsummaryrefslogtreecommitdiffstats |