From: Junio C Hamano <redacted>
Date: Wed, 21 Nov 2018 13:57:53 +0000 (+0900)
Subject: Merge branch 'tg/conflict-marker-size' into maint
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=04d70dd64837a088f1e95286e328801085631e82;p=git.git

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

Developer aid.

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

04d70dd64837a088f1e95286e328801085631e82