From: OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>
Date: Wed, 22 Apr 2020 14:34:57 +0000 (+0200)
Subject: Merge pull request #2081 from cgwalters/deploy-etc
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~10^2~53
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8996ead2ea7422903ee4d4a4b4024c44c866a7fe;p=ostree.git

Merge pull request #2081 from cgwalters/deploy-etc

deploy: Add --no-merge
---

8996ead2ea7422903ee4d4a4b4024c44c866a7fe