A utility for automatically merging an upstream repository