1 Commits (c6ec3b13b81d59272e41d5316689c65dd4cc2e63)

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