Michael Forney <mforney@xxxxxxxxxxx> writes: > Ah. Well, it looks like all but git-merge-resolve.sh run `. > git-sh-setup`, so we know that GIT_EXEC_PATH must in their PATH (and > at the front unless the script was invoked directly). > > git-merge-resolve.sh does not do this, so I suppose if the user ran > $GIT_EXEC_PATH/git-merge-resolve directly, and also had a custom > git-merge-index executable in their PATH, that would switch to running > the git merge-index built-in instead. We are good then. Nobody other than "git merge" should be running merge-resolve, so the original probably is OK. Thanks for digging deeper.
