Ease your vendor branch management worries with Piston, a tool to copy vendor / upstream code to your own repository, while preserving your local patches.
Use the diff subcommand to know what changes are in your repository compared to the upstream repository.