3 Commits (eb858c60d7850fc2ed2f69397f0560e707de324d)

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