Jesse Phillips Wrote: > > where the web view will highlight the revision's changes. Does git or > > mercurial > > do that? The other thing I like a lot about gif is it sends out emails for > > each > > checkin. > > > > One thing I would dearly like is to be able to merge branches using meld. > > > > http://meld.sourceforge.net/ > > Git does not have its own merge tool. You are free to use meld. Though there > is gitmerge which can run meld as the merge tool.
Just realized you probably meant more than just resolving conflicts. And what you might be interested in git cherry picking. I haven't done it myself and don't know if meld could be used for it.
