Hi Torsten, On Sat, 23 Jan 2016, Torsten Bögershausen wrote:
> On 2016-01-22 18.01, Johannes Schindelin wrote: > > From: Beat Bolli <dev+...@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
