Work around --is-ancestor not being present in git-merge-base before git 1.8.0
Work around --is-ancestor not being present in git-merge-base before git 1.8.0

See https://github.com/saltstack/salt/issues/27487#issuecomment-146683397

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt