From: Charles Bailey <charles@hashpling.org>
To: Caleb Cushing <xenoterracide@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: how do I resolve this merge manually + mergetool bug
Date: Tue, 24 Feb 2009 07:47:27 +0000 [thread overview]
Message-ID: <20090224074727.GA23927@hashpling.org> (raw)
In-Reply-To: <81bfc67a0902232204y7a1e9a91x6cbf751319664734@mail.gmail.com>
On Tue, Feb 24, 2009 at 01:04:23AM -0500, Caleb Cushing wrote:
> regardless of mergetools problems I'd like to know how to fix this
> merge without mergetool.
I see you've now resolved this without mergetool, I'll look at adding
a test case to mergetool and see how easy it is to get it to handle
this case better.
--
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
next prev parent reply other threads:[~2009-02-24 7:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-24 6:04 how do I resolve this merge manually + mergetool bug Caleb Cushing
2009-02-24 6:31 ` Junio C Hamano
2009-02-24 6:52 ` Caleb Cushing
2009-02-24 7:16 ` Junio C Hamano
2009-02-24 7:19 ` Caleb Cushing
2009-02-24 7:47 ` Charles Bailey [this message]
2009-02-24 8:32 ` Caleb Cushing
2009-02-24 9:13 ` Charles Bailey
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=20090224074727.GA23927@hashpling.org \
--to=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=xenoterracide@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).