mirror of
https://passt.top/passt
synced 2025-05-31 13:25:34 +02:00
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 <sbrivio@redhat.com>
This commit is contained in:
parent
0070e35d2b
commit
b516d151b1
2 changed files with 17 additions and 17 deletions
test/demo
|
@ -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.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue