git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: chombee <chombee@lavabit.com>
To: git@vger.kernel.org
Subject: Git merge using patience diff?
Date: Mon, 26 Apr 2010 19:09:23 +0100	[thread overview]
Message-ID: <20100426180923.GC18122@debxo> (raw)

Hey,

Is it possible to get git to use patience diff when merging?

My version of git is 1.5.*, from before git diff had the --patience
option. I got git diff to use bzr's implementation of patience diff via
GIT_EXTERNAL_DIFF. But when merging git still seems to use its normal
diff. Will I need to write my own merge driver that uses patience diff?

Thanks

             reply	other threads:[~2010-04-26 18:09 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-26 18:09 chombee [this message]
2010-04-26 18:59 ` Git merge using patience diff? Jonathan Nieder

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=20100426180923.GC18122@debxo \
    --to=chombee@lavabit.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).