commit: use xstrdup() in get_merge_parent()