| Age | Commit message (Expand) | Author |
|---|---|---|
| 2025-08-03 | Normalize `merge.conflictStyle` casing | Justin Su |
| 2024-10-29 | Recommend zdiff3 merge.conflictStyle (#1260) | Adam Johnson |
| 2024-10-22 | Don't set colorMoved in introductory instructions (#1884) | Dan Davison |
| 2022-01-15 | Fix links | Dan Davison |
| 2022-01-15 | Split README.md into mdbook manual | Dan Davison |
