Log - 0d313b2b7bb219542473a25ad042f4b990e69a45 - jrn/git - Git at Google

1b1fdf8 read-tree --aggressive by Junio C Hamano · 19 years ago
88f8f0a [PATCH] Enable and fix support for base less merges. by Fredrik Kuivinen · 19 years ago
2276aa6 Use Daniel's read-tree in the merge strategy 'resolve'. by Junio C Hamano · 20 years ago
91063bb Multi-backend merge driver. by Junio C Hamano · 20 years ago