merge script: handle -m --log correctly