Merge branch 'tg/conflict-marker-size'
Developer aid. * tg/conflict-marker-size: .gitattributes: add conflict-marker-size for relevant files
Junio C Hamano committed
Sep 17, 2018 at 13:53 UTC
4dd0c4a44cf9500f3197062da1a82a83a867fb94
No changes.