| 2018-08-29 | rerere: mention caveat about unmatched conflict markers | blob | diff | raw | |
| 2018-08-06 | rerere: teach rerere to handle nested conflicts | blob | diff | raw | diff to current | |
| 2018-08-06 | rerere: add documentation for conflict normalization | blob | diff | raw | diff to current | |