threads / discuss / 44780

git mergetool Segmentation fault

Subject: git mergetool Segmentation fault

## tl;dr

One message between Dec 28, 2016 and Dec 28, 2016.

replies: 0people: 1as markdown or json

KES· Dec 28, 2016, 13:09 UTC · lore

I suppose this is some bug. Because `Segmentation fault` is not expected in any case

http://stackoverflow.com/questions/41362676/how-to-resolve-merge-conflict-while-rebasing

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