| 2005-09-14 | Merge branch 'master' of . | blob | diff | raw | |
| 2005-09-13 | [PATCH] Rename the 'fredrik' merge strategy to 'recursive'. | blob | diff | raw | |
| 2005-09-13 | Fix off-by-one error in git-merge | blob | diff | raw | diff to current | |
| 2005-09-11 | Add a new merge strategy by Fredrik Kuivinen. | blob | diff | raw | diff to current | |
| 2005-09-11 | Use Daniel's read-tree in the merge strategy 'resolve'. | blob | diff | raw | diff to current | |
| 2005-09-11 | Multi-backend merge driver. | blob | diff | raw | diff to current | |