]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'tg/conflict-marker-size' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:53 +0000 (22:57 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 21 Nov 2018 13:57:53 +0000 (22:57 +0900)
commit04d70dd64837a088f1e95286e328801085631e82
tree53eae279181c6d9cce28e2f2b40d51311718a20c
parent7532a181895e2560ffe8b631df9add386b84671c
parentb9b07efdb2ac35684d3ee3fe98f91691d5b8642a
Merge branch 'tg/conflict-marker-size' into maint

Developer aid.

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