Skip to main content

Browse the archive

Revision 04d70dd64837a088f1e95286e328801085631e82 authored by Junio C Hamano on 21 November 2018, 13:57:53 UTC, committed by Junio C Hamano on 21 November 2018, 13:57:53 UTC 
Merge branch 'tg/conflict-marker-size' into maint
 
Developer aid.

* tg/conflict-marker-size:
  .gitattributes: add conflict-marker-size for relevant files
2 parent s 7532a18 + b9b07ef
Raw File
.gitmodules 
[submodule "sha1collisiondetection"]
	path = sha1collisiondetection
	url = https://github.com/cr-marcstevens/sha1collisiondetection.git
	branch = master
back to top