threads / discuss / 2393

Re: Expected Behavior?

Subject: Re: Expected Behavior?

## tl;dr

One message between Nov 8, 2005 and Nov 8, 2005.

replies: 0people: 1as markdown or json

Jon Loeliger· Nov 8, 2005, 03:07 UTC · lore

Show 5 quoted lines

> It appears that as the everyday workhorse, using Daniel's
> git-merge-resolve is stable through git-merge have proven stable
> enough.  So here is a question.  Do people mind if 'git-resolve'
> and 'git-octopus' are dropped before 1.0?  This means 2 less
> programs in your /usr/bin ;-).

It's OK with me. :-)

jdl

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