Re: [PATCH] merge-file: consider core.crlf when writing merge markers

2015-11-25 Thread Johannes Schindelin
Hi Beat, On Tue, 24 Nov 2015, Beat Bolli wrote: > On 24.11.15 23:43, Beat Bolli wrote: > > On 24.11.15 09:21, Johannes Schindelin wrote: > >> > >> On Mon, 23 Nov 2015, Beat Bolli wrote: > >> > >>> When merging files in repos with core.eol = crlf, git merge-file > >>> inserts just a LF at the end

Re: [PATCH] merge-file: consider core.crlf when writing merge markers

2015-11-24 Thread Beat Bolli
On 24.11.15 23:43, Beat Bolli wrote: > On 24.11.15 09:21, Johannes Schindelin wrote: >> Hi Beat, >> >> On Mon, 23 Nov 2015, Beat Bolli wrote: >> >>> 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

Re: [PATCH] merge-file: consider core.crlf when writing merge markers

2015-11-24 Thread Beat Bolli
On 24.11.15 09:21, Johannes Schindelin wrote: > Hi Beat, > > On Mon, 23 Nov 2015, Beat Bolli wrote: > >> 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

Re: [PATCH] merge-file: consider core.crlf when writing merge markers

2015-11-24 Thread Johannes Schindelin
Hi Beat, On Mon, 23 Nov 2015, Beat Bolli wrote: > 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

[PATCH] merge-file: consider core.crlf when writing merge markers

2015-11-23 Thread Beat Bolli
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