merge-recursive: fix parsing of "diff-algorithm" option