(off-list ancestor, not in this archive)
[PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only · Marius Storm-Olsen <hidden> · 2016-06-15
Re: [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only · Johannes Sixt <hidden> · 2016-06-15
Re: [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only · Marius Storm-Olsen <hidden> · 2016-06-15
Re: [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only · Johannes Sixt <hidden> · 2016-06-15
Re: [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only · Marius Storm-Olsen <hidden> · 2016-06-15
[PATCH 1/2] Add testcase for merging in a CRLF repo · Johannes Schindelin <hidden> · 2016-06-15
[PATCH 2/2] merge-recursive: respect core.autocrlf · Johannes Schindelin <hidden> · 2016-06-15

Re: [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only

From: Marius Storm-Olsen <hidden>
Date: 2016-06-15 22:44:43

Possibly related (same subject, not in this thread)

2016-08-13 · [PATCH] Add testcase for merging in a CRLF repo, showing that conflict file is in LF only · Marius Storm-Olsen <hidden>

Marius Storm-Olsen said the following on 09.06.2008 16:46:

... Then you commit. The end result is that you have a workingdir with a mix of LF and CRLF files, which after some more operations may trigger a "whole file changed" diff, due to the workingdir file now having LF EOLs.

..actually, it's more like applying patches and cherry-picking then breaks when the touch the same file, if I recall correctly.

Thanks for all the pointers, I'll send an updated patch tomorrow.

--
.marius

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help