1
0
mirror of https://passt.top/passt synced 2024-12-24 14:45:22 +00:00
passt/test/demo
Stefano Brivio b516d151b1 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>
2022-08-01 12:45:05 +02:00
..
passt demo: Use git protocol downloads 2022-07-22 19:42:18 +02:00
pasta demo: Use git protocol downloads 2022-07-22 19:42:18 +02:00
podman contrib, test: Rebase Podman patch, enable three-way merge on git am in demo 2022-08-01 12:45:05 +02:00