gbp: Switch to 'merge' merge-mode for import-orig

This mode does a regular git merge of the upstream/x.y.z tag into the debian/latest branch. The downside compared to the 'replace' mode is supposed to be that you're left to handle merge conflicts on your own, but since we don't ever change anything outside of the debian/ directory we're not going to run into that anyway.