added an usable merge patch test

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