]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7532a18 b9b07ef)
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)
Developer aid.

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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.