Use -kk to suppress patches for $Id$ differences between branches.