git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Bug-ish: CRLF endings and conflict markers

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jan 11, 2007, 09:46 UTC
Message-ID
<Pine.LNX.4.63.0701111043440.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<200701110941.22024.andyparkins@gmail.com>
Hi,
On Thu, 11 Jan 2007, Andy Parkins wrote:
Show 5 quoted lines
> [describes that conflict markers have LF-only line ending, even if file 
>  has CR-LF line endings]
> 
> The best solution is probably to use the line ending of the conflicted 
> lines.

Question is: how to find out. Especially if your file already has mixed line endings...

> I've had a look, but I can only fine builtin-rerere.c that generates the 
> markers - would that be the place to make this change?

No. It would be in xdiff/xmerge.c:{139,147,160}. But I think that xdiff really is LF-only throughout, so you'd have to do much more work anyway.

Ciao, Dscho

Previous: Andy ParkinsNext: Andy Parkins
Message 2 of 8 in “Bug-ish: CRLF endings and conflict markers”
  1. Andy ParkinsJan 11, 2007
  2. Johannes SchindelinJan 11, 2007
  3. Andy ParkinsJan 11, 2007
  4. Shawn O. PearceJan 11, 2007
  5. Johannes SchindelinJan 11, 2007
  6. Shawn O. PearceJan 11, 2007
  7. Johannes SchindelinJan 11, 2007
  8. Shawn O. PearceJan 11, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.