Re: [PATCH] git-mergetool: add support for ediff

On 6/28/07, Sam Vilain [off-list ref] wrote:

There was emerge already but I much prefer this mode.

I beat ya to it: http://marc.info/?l=git&m=118301192520295&w=2

But it looks like maybe you did a better job (updated docs, for
example). Other than that, it's almost exactly the same.

Ack.

Jason

P.S.

doing this:

     if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then
        merge_tool_candidates="$merge_tool_candidates emerge ediff"
     fi

and then this

    merge_tool_candidates="$merge_tool_candidates opendiff ediff emerge vimdiff"

makes this

     echo "merge tool candidates: $merge_tool_candidates"

print out emerge and ediff twice, presumably because we're adding it
in for both "visual" emacs and "regular" (i.e. -nw) emacs. I suck at
shell scripts, so I'm probably missing something but what why do we
have all of that testing for emacs + vim if we just add their tools
anyway right afterwards?