4 Commits (4c8725f16abff4be4812d0d07a663250bef3ef0e)

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. 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