Merge branch 'jc/maint-fmt-merge-msg-no-edit-lose-credit'

Stop spending cycles to compute information to be placed on
commented lines in "merge --no-edit", which will be discarded
anyway.

* jc/maint-fmt-merge-msg-no-edit-lose-credit:
merge --no-edit: do not credit people involved in the side branch

diff --cc builtin.h
Simple merge

diff --cc builtin/fmt-merge-msg.c
Simple merge

diff --cc builtin/merge.c
Simple merge