From: Colin Walters <walters@verbum.org>
Date: Tue, 23 Jan 2024 02:05:44 +0000 (-0500)
Subject: Merge pull request #3143 from yummypeng/main
X-Git-Tag: archive/raspbian/2024.8-1+rpi1^2~7^2~6^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=15b64c24baf2ed02d226664f6b300c7a1bec1ac5;p=ostree.git

Merge pull request #3143 from yummypeng/main

deploy: Ignore sockets, fifos in /etc/<subdir> during merge
---

15b64c24baf2ed02d226664f6b300c7a1bec1ac5