Added a merge argument which allows you to ask git-import-orig to merge the new import into master.  This will cause an editor to open for sign-off of the merge.
Added a merge argument which allows you to ask git-import-orig to merge the new import into master.  This will cause an editor to open for sign-off of the merge.
nayomal/bloom,vrabaud/bloom