From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2018 20:53:49 +0000 (-0700)
Subject: Merge branch 'tg/conflict-marker-size'
X-Git-Tag: v2.20.0-rc0~251
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4dd0c4a44cf9500f3197062da1a82a83a867fb94;p=thirdparty%2Fgit.git

Merge branch 'tg/conflict-marker-size'

Developer aid.

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

4dd0c4a44cf9500f3197062da1a82a83a867fb94