From: Gregory Jefferis <jefferis@gmail.com>
To: Junio C Hamano <gitster@pobox.com>, Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: David Aguilar <davvid@gmail.com>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Choosing a mergetool according to file type
Date: Fri, 26 Jun 2009 18:43:34 +0100 [thread overview]
Message-ID: <C66AC756.2064B%jefferis@gmail.com> (raw)
In-Reply-To: <7viqijszjw.fsf@alter.siamese.dyndns.org>
On 2009-06-26 17:57, "Junio C Hamano" <gitster@pobox.com> wrote:
> You are both correct. Your example runs "gedit" with three files before
> merge. If Gregory's custom mergetool expects the failed half-merge result
> as its input, this is not the interface he is looking for.
I think that Matthieu is more correct this time in that I can do what I need
with the merge driver because I don't need the failed half-merge result.
But I prefer the 2 level arrangement of 1) automatic then 2) fixing merge
conflicts manually since there will be other cases where this is required.
Thank you Junio for pointing out how to do add the necessary functionality -
a project for a rainy weekend I guess.
Best,
Greg.
next prev parent reply other threads:[~2009-06-26 17:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <4A44A66B.10906@viscovery.net>
2009-06-26 11:04 ` Choosing a mergetool according to file type Gregory Jefferis
2009-06-26 11:29 ` Johannes Sixt
2009-06-26 12:04 ` Matthieu Moy
2009-06-26 13:27 ` Gregory Jefferis
2009-06-26 13:51 ` Matthieu Moy
2009-06-26 16:57 ` Junio C Hamano
2009-06-26 17:43 ` Gregory Jefferis [this message]
2009-06-26 17:03 ` Gregory Jefferis
2009-06-26 10:28 Gregory Jefferis
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=C66AC756.2064B%jefferis@gmail.com \
--to=jefferis@gmail.com \
--cc=Matthieu.Moy@imag.fr \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).