4 Commits (61ffbcb988046dfaf8266569f78a31483be026f6)

Author SHA1 Message Date
Junio C Hamano 1b1fdf8c2f read-tree --aggressive 19 years ago
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