Merge branch 'lo/doc-merge-submodule-update'

What happens to submodules during merge has been documented in a bit more detail. * lo/doc-merge-submodule-update: merge-strategies.adoc: detail submodule merge