Merge branch 'tg/conflict-marker-size' into maint
Developer aid. * tg/conflict-marker-size: .gitattributes: add conflict-marker-size for relevant files
Junio C Hamano committed
Nov 21, 2018 at 22:57 UTC
04d70dd64837a088f1e95286e328801085631e82
No changes.