On 2013-06-13 10:20, Serhiy Storchaka wrote: > 13.06.13 05:41, Tim Chase написав(ла): > > -hg: last I checked, can't do octopus merges (merges with more > > than two parents) > > > > +git: can do octopus merges > > Actually it is possible in Mercurial.
Okay, then that moots this pro/con pair. I seem to recall that at one point in history, Mercurial required you to do pairwise merges rather than letting you merge multiple branches in one pass. -tkc -- http://mail.python.org/mailman/listinfo/python-list
