On Thu, Sep 04, 2008 at 11:15:56PM +0200, Jakub Narebski <jnareb@xxxxxxxxx> wrote: > 5. git-merge builtin > > Student: Miklos Vajna > Mentor: Johannes Schindelin builtin-merge is merged. I did not have it in my proposal, but support for custom merge strategies is also merged. Lately I was working on a better merge-recursive API, that is mostly in next now. Time did not permit, but I was about to rewrite merge-octopus, merge-one-file and merge-resolve in C as well. I hope I'll have time to do it later in my free time, but I can't promise anything, being a fulltime student as well. ;-)
Attachment:
pgp7XkZeYwZRK.pgp
Description: PGP signature