Code

builtin-merge.c: Fix option parsing