3 Commits (e8cc80d03934cc607e3a4d89a05350c238dbf9c5)

Author SHA1 Message Date
Fredrik Kuivinen 88f8f0a52b [PATCH] Enable and fix support for base less merges. 19 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