aboutgitcodebugslistschat
path: root/test/demo
diff options
context:
space:
mode:
authorStefano Brivio <sbrivio@redhat.com>2022-08-01 12:45:05 +0200
committerStefano Brivio <sbrivio@redhat.com>2022-08-01 12:45:05 +0200
commitb516d151b186835c554e7521b685b41971aabb0d (patch)
treeedf15073117db96365f1fbc0a73662b9e4f70910 /test/demo
parent0070e35d2bd94327562beb0329625f5e01cc9d9f (diff)
downloadpasst-b516d151b186835c554e7521b685b41971aabb0d.tar
passt-b516d151b186835c554e7521b685b41971aabb0d.tar.gz
passt-b516d151b186835c554e7521b685b41971aabb0d.tar.bz2
passt-b516d151b186835c554e7521b685b41971aabb0d.tar.lz
passt-b516d151b186835c554e7521b685b41971aabb0d.tar.xz
passt-b516d151b186835c554e7521b685b41971aabb0d.tar.zst
passt-b516d151b186835c554e7521b685b41971aabb0d.zip
contrib, test: Rebase Podman patch, enable three-way merge on git am in demo2022_08_04.b516d15
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 <sbrivio@redhat.com>
Diffstat (limited to 'test/demo')
-rw-r--r--test/demo/podman2
1 files changed, 1 insertions, 1 deletions
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.