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

Re: [PATCH] Introducing cg-xxdiff for conflict resolution

From
Martin Langhoff <martin.langhoff@gmail.com>
Date
Nov 3, 2006, 02:41 UTC
Message-ID
<46a038f90611021841p54c38d72x12360ec93f32a8ad@mail.gmail.com>
In-Reply-To
<20061103001135.GN20017@pasky.or.cz>
On 11/3/06, Petr Baudis <pasky@suse.cz> wrote:
> > Paski, did this one get dropped? Change of heart? Heart attack?
>
> Hmm, I thought we've agreed to go for the cg-resolve solution
> instead...?

Oops. That wasn't my reading. Misunderstood. In any case, if you go back a bit in the conversation, the usage model I find this useful is one where it makes sense to try different tools that have entirely different parameters. That is why it makes sense to call them differently.

So cg-meld [meld params] , is different from cg-xxdiff [xxdiff params] and cg-wiggle [wiggle params] makes more sense to me and can be maintained by different people (those who like meld probably dont' use xxdiff ;-)

And from a packaging perspective, cg-resolve will depend on a zillion things.
cheers,
Previous: Petr Baudis
Message 9 of 9 in “Introducing cg-xxdiff for conflict resolution”
  1. Introducing cg-xxdiff for conflict resolutionMartin Langhoff, Aug 4, 2006
  2. Petr BaudisSep 24, 2006
  3. Martin LanghoffSep 24, 2006
  4. Petr BaudisSep 24, 2006
  5. Martin LanghoffSep 24, 2006
  6. Petr BaudisSep 24, 2006
  7. Martin LanghoffNov 2, 2006
  8. Petr BaudisNov 3, 2006
  9. Martin LanghoffNov 3, 2006

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.