fix x-merge and add x-verify patch operations

Signed-off-by: Jan Dvořák <mordae@anilinux.org>