update scripts/subtree-merge for more recent versions of git
update scripts/subtree-merge for more recent versions of git

merge now fails on unrelated histories unless you use --allow-unrelated-histories

dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq,dimagi/commcare-hq