.gitattributes: add conflict-marker-size for relevant files
authorThomas Gummerer <t.gummerer@gmail.com>
Tue, 28 Aug 2018 22:05:50 +0000 (23:05 +0100)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Aug 2018 18:27:31 +0000 (11:27 -0700)
commitb9b07ef...b2ac35684d3ee3fe98f91691d5b8642a
treeca2a6d7...8f5c5f17098c9a2c4f4b5adcb464d1bdcopy hash to clipboard (tree)
parent53f9a3e...57dbbc901a02ac2c73346d375e24978ccopy hash to clipboard (diff)
.gitattributes