Re: [PATCH v5 0/2] Let merge-file write out conflict markers with correct EOLs
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 27, 2016, 20:22 UTC
- Message-ID
- <xmqq4mdy93io.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <cover.1453912583.git.johannes.schindelin@gmx.de>
Thanks, will queue after looking at the interdiff since v4.