merge-file doc: set conflict-marker-size attribute#1895

phillipwood wants to merge 1 commit intogitgitgadget:mastergitgitgadget/git:masterfrom

phillipwood:merge-file-doc-attributesphillipwood/git:merge-file-doc-attributesCopy head branch name to clipboard