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

From: Junio C Hamano <gitster@pobox.com>
Date: Jun 30, 2007, 17:19 UTC
Message-ID: <7vk5tle4wq.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <11831937822950-git-send-email-sam.vilain@catalyst.net.nz>

Sam Vilain <sam.vilain@catalyst.net.nz> writes:

> There was emerge already but I much prefer this mode.

I thought Ted said he'll look into clearning this up, so I won't apply it yet at this moment to my tree, but have one comment...

Show 13 quoted lines

> @@ -320,15 +329,15 @@ if test -z "$merge_tool" ; then
>          fi
>      fi
>      if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then
> -        merge_tool_candidates="$merge_tool_candidates emerge"
> +        merge_tool_candidates="$merge_tool_candidates emerge ediff"
>      fi
>      if echo "${VISUAL:-$EDITOR}" | grep 'vim' > /dev/null 2>&1; then
>          merge_tool_candidates="$merge_tool_candidates vimdiff"
>      fi
> -    merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff"
> +    merge_tool_candidates="$merge_tool_candidates opendiff ediff emerge vimdiff"
>      echo "merge tool candidates: $merge_tool_candidates"

So by default outside X environment, if your $EDITOR is emacs, you would use emerge and not ediff, but if your $EDITOR is unset and have emacs in your $PATH you would use ediff not emerge?