3 Commits (88b302f5e2e0a6f6610912df49c473967fe59c89)

Author SHA1 Message Date
Tom Clarke 7d3c82a761 Fixing comment in merge strategies 17 years ago
Junio C Hamano 5be60078c9 Rewrite "git-frotz" to "git frotz" 18 years ago
Junio C Hamano 2276aa6c09 Use Daniel's read-tree in the merge strategy 'resolve'. 19 years ago
Junio C Hamano 91063bbc6c Multi-backend merge driver. 19 years ago