From b516d151b186835c554e7521b685b41971aabb0d Mon Sep 17 00:00:00 2001 From: Stefano Brivio Date: Mon, 1 Aug 2022 12:45:05 +0200 Subject: contrib, test: Rebase Podman patch, enable three-way merge on git am in demo Given that a three-way git merge was enough to cope with context changes in man pages, it's probably a good idea to enable that for 'git am' in the demo too. Signed-off-by: Stefano Brivio --- test/demo/podman | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/demo/podman b/test/demo/podman index 100adc1..f3411d8 100644 --- a/test/demo/podman +++ b/test/demo/podman @@ -32,7 +32,7 @@ say , patch it sleep 1 host cp ../contrib/podman/0001-libpod-Add-pasta-networking-mode.patch __TEMPDIR__/podman host cd __TEMPDIR__/podman -host git am 0001-libpod-Add-pasta-networking-mode.patch +host git am -3 0001-libpod-Add-pasta-networking-mode.patch sleep 1 say , and build it. -- cgit v1.2.3