Merge branch 'pw/custom-conflict-marker-size-for-merge-related-docs'

"git-merge-file" documentation source, which has lines that look like conflict markers, lacked custom conflict marker size defined, which has been corrected.. * pw/custom-conflict-marker-size-for-merge-related-docs: merge-file doc: set conflict-marker-size attribute