From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] merge-recursive: configurable 'merge' program
Date: Tue, 05 Dec 2006 01:01:55 +0100 [thread overview]
Message-ID: <el2cpj$cna$1@sea.gmane.org> (raw)
In-Reply-To: 20061204235647.9BA8B139B0E@magnus.utsl.gen.nz
Sam Vilain wrote:
> For those who like to spawn interactive merge tools on a merge failure
> or otherwise run some kind of script, allow a "merge.tool" repo-config
> option that will take arguments as merge(1) does.
How it goes together with merge-recursive rewrite using built-in merge tool
from xdiff, xdl_merge?
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-12-05 0:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-04 11:36 [PATCH] merge-recursive: configurable 'merge' program Sam Vilain
2006-12-05 0:01 ` Jakub Narebski [this message]
2006-12-05 7:38 ` Johannes Schindelin
2006-12-05 10:23 ` Jakub Narebski
2006-12-05 14:07 ` Johannes Schindelin
2006-12-05 14:26 ` Jakub Narebski
2006-12-05 14:48 ` Johannes Schindelin
2006-12-05 15:01 ` Jakub Narebski
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='el2cpj$cna$1@sea.gmane.org' \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/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).