From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Nov 2018 13:57:53 +0000 (+0900)
Subject: Merge branch 'tg/conflict-marker-size' into maint
X-Git-Tag: v2.19.2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04d70dd64837a088f1e95286e328801085631e82;p=thirdparty%2Fgit.git

Merge branch 'tg/conflict-marker-size' into maint

Developer aid.

* tg/conflict-marker-size:
  .gitattributes: add conflict-marker-size for relevant files
---

04d70dd64837a088f1e95286e328801085631e82