1 Commits (4dcff634e6294bcd7a40c8a51762b675b35be237)

Author SHA1 Message Date
Junio C Hamano 2276aa6c09 Use Daniel's read-tree in the merge strategy 'resolve'. 20 years ago
Junio C Hamano 91063bbc6c Multi-backend merge driver. 20 years ago