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