Re: [PATCH 2/2] merge-file: consider core.crlf when writing merge markers
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 24, 2016, 10:39 UTC
- Message-ID
- <alpine.DEB.2.20.1601241138460.2964@virtualbox>
- In-Reply-To
- <56A31E56.9040700@web.de>
Hi Torsten,
On Sat, 23 Jan 2016, Torsten Bögershausen wrote:
Show 13 quoted lines
> On 2016-01-22 18.01, Johannes Schindelin wrote: > > From: Beat Bolli <dev+git@drbeat.li> > > > > When merging files in repos with core.eol = crlf, git merge-file > > inserts just a LF at the end of the merge markers. Files with mixed > > line endings cause trouble in Windows editors and e.g. > > contrib/git-jump, where an unmerged file in a run of "git jump merge" > > is reported as simply "binary file matches". > > > > [...] > > What happens when the original file already has CRLF ? > And why don't we feed any content into the function ?
Why, indeed. I completely reworked the entire approach and will send out the result in a moment.
Ciao, Dscho