From: Junio C Hamano <redacted>
Date: Mon, 17 Sep 2018 20:53:49 +0000 (-0700)
Subject: Merge branch 'tg/conflict-marker-size'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=4dd0c4a44cf9500f3197062da1a82a83a867fb94;p=git.git

Merge branch 'tg/conflict-marker-size'

Developer aid.

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

4dd0c4a44cf9500f3197062da1a82a83a867fb94