From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: [PATCH] Use diff3 instead of merge in merge-recursive.
Date: Wed, 18 Oct 2006 11:35:28 +0200 [thread overview]
Message-ID: <eh4sfr$3ej$1@sea.gmane.org> (raw)
In-Reply-To: 20061018085949.GA26501@cepheus.pub
Uwe Zeisberger wrote:
> If no error occurs, merge (from rcs 5.7) is nothing but:
>
> diff3 -E -am -L label1 -L label2 -L label3 file1 file2 file3 > tmpfile
> cat tmpfile > file1
>
> Using diff3 directly saves one fork per conflicting file.
Doesn't xdiff library git uses have diff3/merge equivalent?
Couldn't we use that instead (on less dependency, better performance)?
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2006-10-18 9:36 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-18 8:59 [PATCH] Use diff3 instead of merge in merge-recursive Uwe Zeisberger
2006-10-18 9:35 ` Jakub Narebski [this message]
2006-10-18 10:04 ` Johannes Schindelin
2006-10-18 15:53 ` Linus Torvalds
2006-10-19 6:31 ` Daniel Barkalow
2006-10-18 9:38 ` Johannes Schindelin
2006-10-20 21:11 ` Uwe Zeisberger
2006-10-21 0:06 ` Johannes Schindelin
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='eh4sfr$3ej$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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.