diff-merges: fix -m to properly override -c/--cc