[lvm2-commits] master - metadata: Tidy merge.c