git_xmerge_config(): prefer error() to die()