Commit 3f2bb387a43185991d7e077fa5e6c0bb467f2abc
2015-10-28T11:00:55
merge: octopus merge common ancestors when >2 When there are more than two common ancestors, continue merging the virtual base with the additional common ancestors, effectively octopus merging a new virtual base.