error: could not apply d1f13b4c... [Storage] De-quarantine libguestfs test and use data source (#4556)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"


Auto-merging tests/storage/test_libguestfs.py
CONFLICT (content): Merge conflict in tests/storage/test_libguestfs.py
Auto-merging tests/storage/utils.py
CONFLICT (content): Merge conflict in tests/storage/utils.py