Andrew's git / gitweb.git / diff
?
Merge branch 'tg/conflict-marker-size'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:49 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:49 +0000 (13:53 -0700)
Developer aid.

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

Trivial merge