rerere with modified/deleted conflicts

From: Nicolas Pitre <nico@fluxnic.net>
Date: Sep 26, 2011, 23:06 UTC
Message-ID: <alpine.LFD.2.00.1109261904340.2718@xanadu.home>

Is this supported already?

Nicolas

$ 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.