[lvm2-commits] master - snapshot: update merging fix