git diff diverged branches