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

Re: [PATCH] builtin-rerere: fix conflict markers parsing

From
OMOlivier Marin <dkr+ml.git@free.fr>
Date
Jul 7, 2008, 14:44 UTC
Message-ID
<48722BD9.4090406@free.fr>
In-Reply-To
<alpine.DEB.1.00.0807071505470.18205@racer>
Johannes Schindelin a écrit :
> 
> Okay, but then the obvious question is: what do you do about "<<<<<<" 
> lines that are not a marker?
The answer is the same.
> Same remark as before: if you fix rerere, why not do it properly?
If you have a better fix send a patch or at least give me some clues.
Olivier.
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 5 of 9 in “builtin-rerere: fix conflict markers parsing”
  1. builtin-rerere: fix conflict markers parsingOlivier Marin, Jul 7, 2008
  2. Johannes SchindelinJul 7, 2008
  3. Olivier MarinJul 7, 2008
  4. Johannes SchindelinJul 7, 2008
  5. Olivier MarinJul 7, 2008
  6. Johannes SchindelinJul 7, 2008
  7. Junio C HamanoJul 7, 2008
  8. Re* [PATCH] builtin-rerere: fix conflict markers parsingJunio C Hamano, Jul 8, 2008
  9. Olivier MarinJul 8, 2008

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.