freshlybakedca.ke
Git fork
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
+1
.gitattributes
+1
.gitattributes
···
13
13
/mergetools/* text eol=lf
14
14
/t/oid-info/* text eol=lf
15
15
/Documentation/git-merge.adoc conflict-marker-size=32
16
+
/Documentation/git-merge-file.adoc conflict-marker-size=32
16
17
/Documentation/gitk.adoc conflict-marker-size=32
17
18
/Documentation/user-manual.adoc conflict-marker-size=32
18
19
/t/t????-*.sh conflict-marker-size=32