mirror of
https://github.com/netdata/libbpf.git
synced 2026-03-18 23:39:06 +08:00
git apply -3 doesn't always leave conflicted files in the working directory. Use patch --merge instead, it seems to work better in more complicated situations. Signed-off-by: Andrii Nakryiko <andrii@kernel.org>