| Commit message (Collapse) | Author | Files | Lines | ||
|---|---|---|---|---|---|
| 3 hours | Add support for combining --merge and --symmetricHEAD1.3master | Mattias Andrée | 1 | -0/+26 | |
| 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 |