Allow choosing merge diff parent