fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variable