git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Charles Bailey <charles@hashpling.org>
To: "Jonas Flodén" <jonas.floden@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] Quick and dirty mergetool fix - take 2
Date: Fri, 30 Jan 2009 16:18:50 +0000	[thread overview]
Message-ID: <20090130161850.GB26321@hashpling.org> (raw)
In-Reply-To: <1233332166-14300-1-git-send-email-charles@hashpling.org>

On Fri, Jan 30, 2009 at 04:16:06PM +0000, Charles Bailey wrote:

Sorry, I meant to add this comment to the last patch.

I have a test so I'm more confident about this version. It's not
signed off yet as I want to clean up the new test and make sure I've
considered everything - well more things - but it should at least work
now.

-- 
Charles Bailey
http://ccgi.hashpling.plus.com/blog/

  reply	other threads:[~2009-01-30 16:20 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-30 13:05 git mergetool from next not working in subdirectory Jonas Flodén
2009-01-30 13:50 ` Johannes Gilger
2009-01-30 14:06 ` Charles Bailey
2009-01-30 14:22   ` [PATCH] Quick and dirty mergetool fix Charles Bailey
2009-01-30 16:00     ` Jonas Flodén
2009-01-30 16:16       ` [PATCH] Quick and dirty mergetool fix - take 2 Charles Bailey
2009-01-30 16:18         ` Charles Bailey [this message]
2009-01-30 16:22         ` Jonas Flodén

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=20090130161850.GB26321@hashpling.org \
    --to=charles@hashpling.org \
    --cc=git@vger.kernel.org \
    --cc=jonas.floden@gmail.com \
    /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).