1 Commits (a9ed376b158faf82d3685b51d546ccaeda716da3)

Author SHA1 Message Date
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