Remove duplicated code
    
    We used to have three places doing the diff between multiple branches of
    the same or different repo, this is now down to a single one.
    
    This should make it easier to test and fix as needed.