| Commit message (Expand) | Author | Files | Lines | |
|---|---|---|---|---|
| 3 hours | Add support for combining --merge and --symmetricHEAD1.3master | Mattias Andrée | 1 | -12/+14 |
| 23 hours | Add --symmetric1.2 | Mattias Andrée | 1 | -4/+19 |
| 3 days | Add conflcit resultions strategies and interactive mode, and a lot of tests1.1 | Mattias Andrée | 1 | -92/+562 |
| 2024-11-27 | Fix support for CRLF line endings (which git may actually produce on conflict marker lines)1.0.4 | Mattias Andrée | 1 | -1/+1 |
| 2024-11-16 | Use git attributes to determine conflict marker size1.0.3 | Mattias Andrée | 1 | -11/+103 |
| 2024-09-13 | Fix segfault bug1.0.2 | Mattias Andrée | 1 | -1/+1 |
| 2024-08-16 | Fix exit value on usage error1.0.1 | Mattias Andrée | 1 | -1/+1 |
| 2024-08-15 | Fix bug1.0 | Mattias Andrée | 1 | -1/+2 |
| 2024-08-15 | Add README and git-rediff.1 | Mattias Andrée | 1 | -1/+1 |
 |
index : git-rediff | |
| [Complete] Reduce partially resolved merge conflicts | Mattias Andrée <m@maandree.se> |
| aboutsummaryrefslogtreecommitdiffstats |