Re: [PATCH 3/3] mergetool-lib: add diffuse as merge and diff tool

On  0, David Aguilar [off-list ref] wrote:

From: Sebastian Pipping <redacted>

This adds diffuse as a built-in merge tool.

Signed-off-by: Sebastian Pipping <redacted>
Signed-off-by: David Aguilar <redacted>
---

This is Sebastian's patch rebased onto Junio's pu branch.

I removed the git-gui part because I think git-gui
patches go through Shawn / git-gui.git?

Hi Sebastian..
Here's the patch you sent a couple of days ago applied
onto Junio's pu branch

As I mentioned above, you had some git-gui changes in your
original that I stripped out since I was under the impression
that git-gui patches go through Shawn / git-gui.git.

git-send-email (probably gmail, too) won't let me send
one patch in a series with a different "From:" header,
so maybe you should resend this patch so that you can get the
proper authorship recognition?  I've attached the original
patch file I sent in case you want to just grab it and
send-email it back out for the purposes of getting the right
authorship in there (actually, Junio, please advise...,
I'm not exactly sure what you'd prefer)


Also, all three patches should apply independently,
so even though this says 3/3 in principle they are
actually all independent patches,
I just happened to have them queued up that way.

 Documentation/git-difftool.txt         |    4 ++--
 Documentation/git-mergetool.txt        |    3 ++-
 Documentation/merge-config.txt         |    7 ++++---
 contrib/completion/git-completion.bash |    3 ++-
 git-difftool-helper.sh                 |    6 ++----
 git-mergetool-lib.sh                   |   17 ++++++++++++++++-
 git-mergetool.sh                       |    4 ++--
 7 files changed, 30 insertions(+), 14 deletions(-)

-- 

	David