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. I just have made a merge of two files in CPython test suite (http://bugs.python.org/issue18048).