Merge branch 'en/doc-renormalize'

Doc updates.

* en/doc-renormalize:
  doc: clarify the intent of the renormalize option in the merge machinery

diff --cc Documentation/config/merge.adoc
Simple merge

diff --cc Documentation/gitattributes.adoc
Simple merge

diff --cc Documentation/merge-strategies.adoc
Simple merge