Trying vc-git.el again, I think maybe I just didn't merge before???