4668
4668
if mine_only and not local_extra:
4669
4669
# We checked local, and found nothing extra
4671
4671
elif theirs_only and not remote_extra:
4672
4672
# We checked remote, and found nothing extra
4674
4674
elif not (mine_only or theirs_only or local_extra or
4676
4676
# We checked both branches, and neither one had extra