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
..
apparmor	passt, pasta: Add examples of AppArmor policies	2022-03-29 15:35:38 +02:00
debian	contrib: Add example of Debian package files	2022-03-30 05:52:39 +02:00
fedora	contrib/fedora: Use pre-processing macros in spec file	2022-06-08 09:43:48 +02:00
kata-containers	Don't abbreviate ip(8) arguments in examples and tests	2022-06-15 09:38:10 +02:00
libvirt	libvirt, qemu: Move patches to new directory, contrib	2022-01-28 18:51:50 +01:00
podman	contrib, test: Rebase Podman patch, enable three-way merge on git am in demo	2022-08-01 12:45:05 +02:00
qemu	libvirt, qemu: Move patches to new directory, contrib	2022-01-28 18:51:50 +01:00
selinux	passt, pasta: Add examples of SELinux policy modules	2022-03-29 15:35:38 +02:00