From: Nathan Wagner Date: Tue, 13 Nov 2018 21:57:58 +0000 (+0000) Subject: add missing merge option X-Git-Tag: v0.2.16~13 X-Git-Url: https://pd.if.org/git/?a=commitdiff_plain;ds=sidebyside;h=0b5d1faa3bed99cfe7bf7556304387832c0fcd0e;hp=0b5d1faa3bed99cfe7bf7556304387832c0fcd0e;p=zpackage add missing merge option ---