1 Commits (536c4b09370f3f443fbe87284d2378fd21f94350)

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