Michael Haggerty <mhag...@alum.mit.edu> writes: > I've alluded to this little project of mine on the mailing list before, > but I've never really announced it properly. So here we go... > > git-imerge [1] is an open-source tool that helps you perform difficult > Git merges and rebases by allowing conflicts to be resolved > incrementally.
Seems cool! :-) Added to: https://git.wiki.kernel.org/index.php/Interfaces,_frontends,_and_tools#imerge -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
