summaryrefslogtreecommitdiff
path: root/git-merge.sh
AgeCommit message (Expand)Author
2005-09-13[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.Fredrik Kuivinen
2005-09-13Fix off-by-one error in git-mergeJunio C Hamano
2005-09-11Add a new merge strategy by Fredrik Kuivinen.Junio C Hamano
2005-09-11Use Daniel's read-tree in the merge strategy 'resolve'.Junio C Hamano
2005-09-11Multi-backend merge driver.Junio C Hamano