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

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

From
Petr Baudis <pasky@suse.cz>
Date
Nov 3, 2006, 00:11 UTC
Message-ID
<20061103001135.GN20017@pasky.or.cz>
In-Reply-To
<46a038f90611021540s14b6098p477a68ef00c826e9@mail.gmail.com>

Dear diary, on Fri, Nov 03, 2006 at 12:40:38AM CET, I got a letter where Martin Langhoff <martin.langhoff@gmail.com> said that...

Show 10 quoted lines
> On 9/25/06, Petr Baudis <pasky@suse.cz> wrote:
> >> >But I can adjust such details when applying your patch.
> >>
> >> Great! -- I'm travelling and at an airport "free access" computer. It
> >> should be illegal to run airports without free wifi in this day and
> >> age.
> >
> >Heartily agreed.
> 
> 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...?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
$/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1
Previous: Martin LanghoffNext: Martin Langhoff
Message 8 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.