From: "Martin Langhoff" <martin.langhoff@gmail.com>
To: "Petr Baudis" <pasky@suse.cz>
Cc: "Martin Langhoff" <martin@catalyst.net.nz>, git@vger.kernel.org
Subject: Re: [PATCH] Introducing cg-xxdiff for conflict resolution
Date: Fri, 3 Nov 2006 12:40:38 +1300 [thread overview]
Message-ID: <46a038f90611021540s14b6098p477a68ef00c826e9@mail.gmail.com> (raw)
In-Reply-To: <20060924172838.GZ13132@pasky.or.cz>
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?
cheers,
next prev parent reply other threads:[~2006-11-02 23:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-04 3:34 [PATCH] Introducing cg-xxdiff for conflict resolution Martin Langhoff
2006-09-24 16:50 ` Petr Baudis
2006-09-24 17:02 ` Martin Langhoff
2006-09-24 17:12 ` Petr Baudis
2006-09-24 17:22 ` Martin Langhoff
2006-09-24 17:28 ` Petr Baudis
2006-11-02 23:40 ` Martin Langhoff [this message]
2006-11-03 0:11 ` Petr Baudis
2006-11-03 2:41 ` Martin Langhoff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46a038f90611021540s14b6098p477a68ef00c826e9@mail.gmail.com \
--to=martin.langhoff@gmail.com \
--cc=git@vger.kernel.org \
--cc=martin@catalyst.net.nz \
--cc=pasky@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).