Code

Documentation: update to git-merge-base --octopus