Implement fallback in case git diff does not work with merge-base

Implement fallback in case git diff does not work with merge-base #20649