Hi Junio, On Wed, 20 Jan 2016, Junio C Hamano wrote: > * bb/merge-marker-crlf (2015-11-24) 1 commit > - merge-file: consider core.crlf when writing merge markers > > Write out merge markers using system end-of-line convention. > > Waiting for a re-roll to handle gitattributes. > ($gmane/281701) For the record, it is $gmane/281700. I will send out a replacement series shortly. Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html