| Description: | Reduce partially resolved merge conflicts |
| Status: | Complete |
| Source: | https://git.maandree.se/git-rediff |
| Latest release: | 1.0.4 |
| License: | ISC License (Internet Systems Consortium license) |
| Written in: | C (ISO C99) |
The git-rediff utility rewrites files containing git merge conflicts to remove conflicts that have been resolved.